Add email support & correct navbar bug
Merge branch 'master' of github.com:sheaney/monkeytrip