Merge remote-tracking branch 'origin/master'
Did quite a lot here.

* Hooked up spring social to allow facebook logins
* Allow existing accounts to be associated to facebook logins
* Include js inline in page to allow better caching
Don't show user name for now. Takes up too much space