Updated deploy for RVM

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'rbac' of http://github.com/ABTech/abtt into rbac

Conflicts:
	Gemfile.lock