Refactoring user model and forms so that email is username. various small changes to styles for ajax login stuff. incomplete work at this stage.
Merge remote-tracking branch 'origin/develop' into develop