updated gemfile to include ruby 2.0.0
updated unicorn to back down on the amount of worker processes in unicorn.rb for heroku
fixed gemfile usage for specifying ruby version
added configuration changes required to run unicorn on Heroku rather than rails server
Merge branch 'master' into heroku
syncd with master
syncd with master

Conflicts:
	config/unicorn.rb
syncd with master
Merge branch 'master' into heroku