Update Gemfile

Separate development and production environments; Use Hartl set of tested gems
Merge branch 'master' of heroku.com:glenjarvis-website

Conflicts:
	Gemfile
	Gemfile.lock