Fix an outdated path in the readme
Update Gemfile.lock
Merge branch 'master' into bootstrap-3

Conflicts:
	Gemfile.lock
Switch to the proper CSS classes for Bootstrap 3