Lots of new functionality
Merge branch 'master' of https://github.com/johnjoeallen/Colony.git