cleaning up
Merge branch 'master' of https://github.com/cfitz/aat-plugin

Conflicts:
	README.md