Working version
Merge branch 'master' of github.com:scribe/Hive

Conflicts:
	Gemfile.lock
Lots of changes to fix redirect problem