Updated the README
Moved binding_of_caller into development
Convert views from .erb to .haml

Convert devise views
Convert application layout
Added cucumber features for sign in/out/up
Merge branch 'master' of github.com:adaptivelab/market_sprint_rails_template

* 'master' of github.com:adaptivelab/market_sprint_rails_template:
  Convert views from .erb to .haml

Conflicts:
	app/views/layouts/application.html.erb
Added Sign Out to the application template
Removed pending from admin_user_spec
Add bootstrap and bower

Add Bower
Installed bootstrap using bower
Update layout from erb to haml
Include bower bootstrap in stylesheets
Update application layout to include nav bar and alerts
Add demo components in haml
Add css variables
Add font-awesom
Merge branch 'feature/ks/bower_bootstrap'
Set up travis so it runs using poltergeist
Upgraded to Rails 4.1.0 from Rails 4.0.0
Added template.rb, allowing for much easier set up of new projects based on this template
Remove outdated feature tests
Correct icon paths to get tests working

These will be removed in the next round of changes so very much a
temporary fix