Merge pull request #225 from BronyBorn/master

Quotation conflict with Postgres
Added additional fields to user table, as well as social links and notes
Merge branch 'master' of github.com:jbroadway/elefant
Added REST API for adding/removing social links and notes
Loading from lib then models (alphabetical)
Started adding additional fields to user profile form, photo upload working
Added type parameter to add_script() and add_style(), useful for alternate types, e.g., text/jsx
Notes on users have been added as a React.js component
Social links can now be added by admins on user detail screen
Added icons to social links
Minor tweaks