cleanup trigger removal, fix pom/aspectj issue
Merge pull request #6 from lukepatrick/master

cleanup trigger code