added shotgun woot
Merge branch 'master' into shotgun

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #1 from jimnanney/shotgun

added shotgun woot