Capistrano
Fixes
Gemfile being weird
Revert "Gemfile being weird"

This reverts commit 11e4f064da75f2e92522448979e7b4b6c828fff6.
Needed rvm
Update capistrano-rvm
Add javacscript runtime
Finished deploy scripts
Merge branch 'master' into deploy

Conflicts:
	Gemfile.lock
Merge pull request #1 from isfit/deploy

Deploy