Merge pull request #1126 from simod/master

fix the "operator does not exist: boolean = integer" error
submission_count can either be a number or a function depending on where it is called from - fixes #1122
Merge pull request #1127 from modilabs/1122_replace_form_broken

submission_count can either be a number or a function
give a change to define mongodb in local_settings
BUGFIX: make TEMPLATE_DIRS a tuple
changes to allow mongo settings within local settings
upadted mongo connection to use connection url to allow authenticated connections
added port and used dict for url formatting
pep8 to force travis test
added cludless earth map and removed natural earth 2 - fixes #1113 [ci skip]
Merge pull request #1134 from modilabs/cloudless_earth

Added cludless earth map and removed natural earth 2 - fixes #1113 [ci skip]
rmoved people link for none staff/admin - fixes #1135
Merge pull request #1138 from modilabs/1135_remove_people_link

Removed people link for none staff/admin - fixes #1135
added cludless earth map and removed natural earth 2 - fixes #1113 [ci skip]
prettify [ci skip]
Merge pull request #1128 from modilabs/mongo_local_settings

Allow mongo db setting override from within local settings
update instructions, avoids no such table: django_digest_partialdigest during syncdb
redirect to attachment url, briefcase attachment downloads should be work as expected
update test to reflect expected redirect
Merge pull request #1142 from modilabs/original-image-download

Allows attachments to be downloaded properly by ODK Briefcase