Merge branch 'release/0.4.1'

* release/0.4.1:
  Prep 0.4.1
  Update docs with latest README

CHANGELOG.md

@@ -18,6 +18,25 @@ https://github.com/donnemartin/saws/issues
 Changelog
 =========
 
+0.4.1 (2015-05-31)
+------------------
+
+### Bug Fixes
+
+* [#83](https://github.com/donnemartin/saws/pull/83) - Update to `prompt-toolkit` 1.0.0, which includes a number of performance improvements (especially noticeable on Windows) and bug fixes.
+
+### Updates
+
+* [#75](https://github.com/donnemartin/saws/pull/75), [#76](https://github.com/donnemartin/saws/pull/76) - Fix groff install and follow Dockerfile best practices.
+* [#85](https://github.com/donnemartin/saws/pull/85) - Update packaging dependencies based on semantic versioning.
+* [#86](https://github.com/donnemartin/saws/pull/86) - Fix linter issues regarding imports.
+* Update list of commands.
+* Update INSTALLATION:
+    * Add install from SOURCE.
+    * Add note about OS X 10.11 pip issue (now also in README).
+    * Update intro.
+* Update link to style guide in CONTRIBUTING.
+
 0.4.0 (2015-12-08)
 ------------------
 

CHANGELOG.rst

@@ -20,6 +20,35 @@ https://github.com/donnemartin/saws/issues
 Changelog
 =========
 
+0.4.1 (2015-05-31)
+------------------
+
+Bug Fixes
+~~~~~~~~~
+
+-  `#83 <https://github.com/donnemartin/saws/pull/83>`__ - Update to
+   ``prompt-toolkit`` 1.0.0, which includes a number of performance
+   improvements (especially noticeable on Windows) and bug fixes.
+
+Updates
+~~~~~~~
+
+-  `#75 <https://github.com/donnemartin/saws/pull/75>`__,
+   `#76 <https://github.com/donnemartin/saws/pull/76>`__ - Fix groff
+   install and follow Dockerfile best practices.
+-  `#85 <https://github.com/donnemartin/saws/pull/85>`__ - Update
+   packaging dependencies based on semantic versioning.
+-  `#86 <https://github.com/donnemartin/saws/pull/86>`__ - Fix linter
+   issues regarding imports.
+-  Update list of commands.
+-  Update INSTALLATION:
+
+   -  Add install from SOURCE.
+   -  Add note about OS X 10.11 pip issue (now also in README).
+   -  Update intro.
+
+-  Update link to style guide in CONTRIBUTING.
+
 0.4.0 (2015-12-08)
 ------------------
 

docs/source/README.rst

@@ -1,13 +1,13 @@
 .. figure:: http://i.imgur.com/vzC5zmA.gif
    :alt: 
 
+SAWS
+====
+
 |Build Status| |Documentation Status| |Dependency Status| |Codecov|
 
 |PyPI version| |PyPI| |License|
 
-SAWS
-====
-
 Motivation
 ----------
 
@@ -345,7 +345,7 @@ Note: Fuzzy completion currently only works with AWS
    :alt: 
 
 Fish-Style Auto-Suggestions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+---------------------------
 
 ``SAWS`` supports Fish-style auto-suggestions. Use the ``right arrow``
 key to complete a suggestion.
@@ -354,15 +354,15 @@ key to complete a suggestion.
    :alt: 
 
 Executing Shell Commands
-~~~~~~~~~~~~~~~~~~~~~~~~
+------------------------
 
 ``SAWS`` allows you to execute shell commands from the ``saws>`` prompt.
 
 .. figure:: http://i.imgur.com/FiSn6b2.png
    :alt: 
 
 Command History
-~~~~~~~~~~~~~~~
+---------------
 
 ``SAWS`` keeps track of commands you enter and stores them in
 ``~/.saws-history``. Use the up and down arrow keys to cycle through the
@@ -432,7 +432,7 @@ Toolbar Options
    :alt: 
 
 Windows Support
-~~~~~~~~~~~~~~~
+---------------
 
 ``SAWS`` has been tested on Windows 7 and Windows 10.
 
@@ -501,6 +501,18 @@ To view ``SAWS`` ``virtualenv`` and `Docker <https://www.docker.com/>`__
 installation instructions, click
 `here <https://github.com/donnemartin/saws/blob/master/INSTALLATION.md>`__.
 
+Mac OS X 10.11 El Capitan Users
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There is a known issue with Apple and its included python package
+dependencies (more info at https://github.com/pypa/pip/issues/3165). We
+are investigating ways to fix this issue but in the meantime, to install
+saws, you can run:
+
+::
+
+    $ sudo pip install saws --upgrade --ignore-installed six
+
 AWS Credentials and Named Profiles
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

saws/__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.4.0'
+__version__ = '0.4.1'