Fixed mail import and countdown
Fixed a few mail errors
Added recaptcha to password reset
Merge branch 'master' into v2

Conflicts:
	flamejam/mail.py
	flamejam/static/js/countdown.js
	flamejam/views.py
Minor fixes, small text changes