Prepping for merge.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting

Conflicts:
	public/views/login/loginCtrl.js
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Removes floating point from total in monthly report.
BCrypt
Debugging.
Merge pull request #180 from jacob-israel-turner/master

Cleans up report.
index on master: 4755e6d Merge pull request #180 from jacob-israel-turner/master
On master: env vars
Merge pull request #181 from cahlan/env-vars

Env vars
tweaking trends page a bit
Merge pull request #182 from cahlan/trends-tweaks

tweaking trends page a bit
upstream