Refactor and get rid of something
Merge branch 'master' of
https://github.com/insidiousnoxious/dynamicninja.git