Added some basic error checking
catches nil in #site
Merge branch 'master' into deploy

Conflicts:
	Gemfile
	app.rb