migration
2014
start on email work
Email auth works in dev mode.
Merge branch 'master'

* refs/heads/master:
  Git SHA no longer needed when updating automatically
  Did I escape that enough?
  Fix heroku and travis weirdness?
  Use git for deploy

Conflicts:
	app/views/layouts/_footer.html.haml
Use ENV vars for mail signin
Merge pull request #9 from HeisenBugDev/28-email-auth

Email Auth