Fixed some specs
Updated to latest plugin gem
Merge branch 'plugins' into plugins_test

Conflicts:
	Gemfile.lock