Merge branch 'develop'
Update README.md
Merge branch 'develop'
Merge branch 'master' of github.com:code4maine/beehve
Secure the upstart file.
Setting beehve settings.
Merge pull request #45 from Code4Maine/develop

Develop
Merge branch 'develop'
Merge branch 'master' of github.com:code4maine/beehve
Merge branch 'develop'
Merge branch 'develop'
Release v1.1.0

* develop:
  Trying to improve the display of git commit messages on the timeline.
Release v1.1.1

* develop:
  Okay, one more try at formatting git commit messages for display.
Release v2.0.0

* develop:
  Updating changelog.
  Adding cron job to ansible django tasks
  Ignore Sentry logging if DSN_VALUE not set
  Adding new color for git commits

Conflicts:
	beehve/settings.py
Merge branch 'master' into feature/new-homepage