Merge branch 'devel' into release

.gitignore

MANIFEST.in

Makefile

Vagrantfile

bin/mentat-hawat-dev.wsgi

bin/mentat-hawat-vagrant.wsgi

conf/apache/maintenance/bootstrap.min.css

conf/apache/maintenance/index.html

conf/apache/site_mentat_vagrant.conf

conf/core/common.json.conf

conf/core/database.json.conf

conf/core/reporting.json.conf

conf/cron/mentat-backup-py.cron

conf/cron/mentat-cleanup-py.cron

conf/cron/mentat-informant-py.cron

conf/cron/mentat-netmngr-py.cron

conf/cron/mentat-precache-py.cron

conf/cron/mentat-reporter-py.cron

conf/cron/mentat-statistician-py.cron

conf/cron/mentat-watchdog-events-py.cron