Added stats script
Tuning stats
Switched to bootstrap as gem, included simple_form
Updated schema
New Time Machine UX
Added pagination to time slices
Fixed all rspec tests
Fixing cucumber tests
Finished fixing cucumber tests
Merge branch 'dev'
Merge branch 'dev' of github.com:AGILiDEE/backbone into dev

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/layouts/application.html.slim
	features/expenses.feature
	features/step_definitions/expenses_steps.rb
Merge branch 'dev'
Removing duplicate expenses tests