Initial style change to match sign up
Merge upstream/master
Change forgot password copy
Merge branch 'pull/279'