gem and setup tweaks
Merge branch 'master' of https://github.com/daleki/huginn

Conflicts:
	Gemfile.lock