New aasm states
Merge branch 'development' of https://github.com/dchbx/gluedb into development