Merge branch 'release/1.0.1' into develop

* release/1.0.1:
  Bump the version number
Formatting
Update pip setup, support Django 1.6
Add settings file, more options
Support settings file, more options
Test for membership should be 'not in'
Cleanup
Get package from the python package index
Update README
Fix newlines in error message
Update README
Update README
Properly quote services_custom: param
Merge branch 'master' into develop

* master:
  Updated README and setup before uploading to PyPI

Conflicts:
	README.rst
	setup.py
Add @bittner to the list of contributors
Bump release
Update changelog
Merge branch 'release/2.0.0'

* release/2.0.0:
  Update changelog
  Bump release
  Add @bittner to the list of contributors
  Properly quote services_custom: param
  Update README
  Update README
  Fix newlines in error message
  Update README
  Get package from the python package index
  Cleanup
  Test for membership should be 'not in'
  Support settings file, more options
  Add settings file, more options
  Update pip setup, support Django 1.6
  Formatting