Beginning CHANGELOG for next version
Merge branch 'master' into develop
Add twitter button

May need to be styled better, but will leave that to future optimization
Update changelog
Move the secret key

Move SECRET_KEY from base.py to local_example.py, where it can be
customized

Also put a copy in travis.py, so Travis still works
Get SECRET_KEY from {staging,production}.ini file
Merge pull request #186 from python/remove-secrets

Remove secrets
Sysadmin fixes

- on PSF box, users in the `admin` group have sudo privileges
- `/etc/sudoers` is automatically regenerated by PSF Chef recipes, so don't alter it
Fix production DB name
Update changelog
Merge branch 'master' into develop
Merge branch 'hotfix/upgrade-django-146' into develop
Improve pagination

* Override bootstrap's @paginationActiveBackground to be darker gray
* Improve `includes/pagination.html` so we can use it site-wide
* Add pagination to Question list
* Add pagination to Followers/Following lists
* Use sitewide pagination template for list of users
* Use sitewide pagination template for feed aggregator
* Use sitewide pagination template for project list
* Add username and count of answers to Question list
Update test since we changed name for pagination
Merge branch 'improve-pagination' into develop

Fixed Conflict in:
	docs/CHANGELOG.rst
Merge branch 'develop' into twitter-link

Fixed Conflicts:
	docs/CHANGELOG.rst
Implement Disqus comments

* Add ':' between meta_title and site_title in base.html template
* Add DISQUS_HOSTNAME and DISQUS_SHORTNAME to settings
* Add Disqus div and JS to project-detail page
* Document settings in Developer docs
* Update Changelog
Merge pull request #185 from python/twitter-link

Twitter link
Merge branch 'develop' into feature/26-disqus

Fixed Conflicts:
	docs/CHANGELOG.rst
Add aggregator to list of modules to test