Fixing some merge conflicts
Merge branch 'master' of github.com:kisonecat/m2o2c2