Merge branch 'release/0.4.0'0.4.0

* release/0.4.0:
  Prep 0.4.0 release

3 files changed, 72 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca1bfde..fb0a616 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,35 @@ https://github.com/donnemartin/haxor-news/issues
 Changelog
 =========
 
+0.4.0 (2016-05-27)
+
+### Features
+
+* [#52](https://github.com/donnemartin/haxor-news/issues/52) - Add `exit` and `quit` commands, which can be used instead of `ctrl-d`.
+* [#53](https://github.com/donnemartin/haxor-news/issues/53) - Allow clicking of urls in some terminals to open in a browser.
+
+### Bug Fixes
+
+* [#36](https://github.com/donnemartin/haxor-news/issues/36) - Fix crash caused by Unicode comments on Windows.
+* [#59](https://github.com/donnemartin/haxor-news/pull/59) - Update to `prompt-toolkit` 1.0.0, which includes a number of performance improvements (especially noticeable on Windows) and bug fixes.
+* Fix some comments and docstrings.
+
+### Updates
+
+* [#48](https://github.com/donnemartin/haxor-news/issues/48) - Update latest monthly hiring post ids.
+* [#56](https://github.com/donnemartin/haxor-news/issues/48) - Update packaging dependencies based on semantic versioning.
+* Fix `Config` docstrings.
+* Update `README`:
+    * Update intro
+    * Add Hacker News discussion of `haxor-news`
+    * Update comments discussion and examples
+    * Update TODO
+    * Fix urls based on redirects
+    * Remove buggy Codecov graph
+    * Add note about OS X 10.11 pip installation issue
+* Add Gemnasium dependencies management.
+* Update links in `CONTRIBUTING`.
+
 0.3.1 (2016-04-10)
 ------------------
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 353f8ef..bacc2a4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -20,6 +20,48 @@ https://github.com/donnemartin/haxor-news/issues
 Changelog
 =========
 
+0.4.0 (2016-05-27)
+
+Features
+--------
+
+-  `#52 <https://github.com/donnemartin/haxor-news/issues/52>`__ - Add
+   ``exit`` and ``quit`` commands, which can be used instead of
+   ``ctrl-d``.
+-  `#53 <https://github.com/donnemartin/haxor-news/issues/53>`__ - Allow
+   clicking of urls in some terminals to open in a browser.
+
+Bug Fixes
+---------
+
+-  `#36 <https://github.com/donnemartin/haxor-news/issues/36>`__ - Fix
+   crash caused by Unicode comments on Windows.
+-  `#59 <https://github.com/donnemartin/haxor-news/pull/59>`__ - Update
+   to ``prompt-toolkit`` 1.0.0, which includes a number of performance
+   improvements (especially noticeable on Windows) and bug fixes.
+-  Fix some comments and docstrings.
+
+Updates
+-------
+
+-  `#48 <https://github.com/donnemartin/haxor-news/issues/48>`__ -
+   Update latest monthly hiring post ids.
+-  `#56 <https://github.com/donnemartin/haxor-news/issues/48>`__ -
+   Update packaging dependencies based on semantic versioning.
+-  Fix ``Config`` docstrings.
+-  Update ``README``:
+
+   -  Update intro
+   -  Add Hacker News discussion of ``haxor-news``
+   -  Update comments discussion and examples
+   -  Update TODO
+   -  Fix urls based on redirects
+   -  Remove buggy Codecov graph
+   -  Add note about OS X 10.11 pip installation issue
+
+-  Add Gemnasium dependencies management.
+-  Update links in ``CONTRIBUTING``.
+
 0.3.1 (2016-04-10)
 ------------------
 
diff --git a/haxor_news/__init__.py b/haxor_news/__init__.py
index 2a3bafc..2abc972 100644
--- a/haxor_news/__init__.py
+++ b/haxor_news/__init__.py
@@ -13,4 +13,4 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-__version__ = '0.3.1'
+__version__ = '0.4.0'