Merge remote-tracking branch 'upstream/master' into merge-upstream

Conflicts:
	Gemfile.lock
fix ruby version, 2.1.1
Merge pull request #4 from Shopify/merge-upstream

Merge upstream
Remove CouchDB, Memcached, Chef, Vagrant, duplicate JavaScript, etc.
Whitespace cleanup.
Fix path to bootstrap.js
Adjust precompiled asset list.
Regenerate.
Fix filename.
Stick compiled assets in public/assets.
Note.