Add login link to navbar, reg link to login
Minor stylistic changes to login form
Merge remote-tracking branch 'upstream/master'