merged changes
pulled changes
Put front-end library dependencies in the Gemfile where they belong; got rid of local copies
Converted some stuff to coffeescript
Minor prettifications to the devise stuff
Battled with conflicts between the various implementations of rails/bootstrap/sass/font-awesome and found a combination that worked
Getting the bootstrap style out of the html; various minor style improvements
Merge pull request #14 from cbarcroft/chrisdfe

Chrisdfe