unicorn+ deploy gems
Merge branch 'master' of github.com:jag0k/deployinator

Conflicts:
	Gemfile
	Gemfile.lock