Re-added activerecord gem
Merge branch 'master' of github.com:adammulligan/BeamMeUp

* 'master' of github.com:adammulligan/BeamMeUp:
  Changed unicorn port
  Changed deploy script inline with gem changes
  Added capfile
  Added capistrano gem (doh)

Conflicts:
	Gemfile.lock