much better handling of unauthorised access
fix outgoing email issue, for integrating with mandrill smtp
modify password reset process to send the user a reset token rather than just resetting the password for them
temporarily change admin email to mine, not sure the one recorded works
minor changes to forgotten password functionality
forgot to tell the user the magic number
put gunicorn requests before restarting back at 1000
revert sysadmin email, it exists
keep dev branch up to date with recent fixes to live