Separate ability specs into resource contexts
Use guard branch fix-540 to fix re-evaluating Guardfile correctly
Use ruby 2.1.0
Fix merge problems
Merge branch 'master' of github.com:jmuheim/base
Merge branch 'master' into features/user_vocabularies

Conflicts:
	Gemfile
	Gemfile.lock
	spec/models/ability_spec.rb