Change order in which css files are joined.
Change class of facebook button, conflict with flat-ui.css
Add fontawesome link back to header
Small styling changes
Merge branch 'master' of https://github.com/Tambling/whetstone