Merge branch 'master' of github.com:katalyst/koi
Bumping devise version
Updating admin to explicitly sign out via POST or DELETE http verbs, rather than GET
bump version number
Merge branch 'master' of github.com:katalyst/koi
Merge branch 'master' into v1.1.0

Conflicts:
	Gemfile.lock
	lib/koi/version.rb