Updated dependencies
Explicitly remove navbar highlighting, which seems to have appeared in bootstrap.
Merge pull request #88 from seedpod/fix-highlighting-navbar

Fix highlighting navbar
Delete .env.swp

Only contained sandbox credentials, so no big deal that it got checked in.
remove mac cruft
Merge branch 'refs/heads/master' into notification-mailer

Conflicts:
	Gemfile.lock