Auto-generated plugin skeleton
Conflicts:
	.gitignore
	.rspec
	Gemfile
	MIT-LICENSE
	lib/column_aliases.rb
Merge branch 'develop'

Conflicts:
	Gemfile
	lib/column_aliases.rb
	spec/dummy/app/models/person.rb
Merge branch 'develop'
Merge branch 'develop'
fix formatting
remove cruft
remove cruft