Did the inverse of what I wanted
Merge branch 'master' of github.com:igutekunst/ooc

Conflicts:
Cleaned up and fixed some dumb mistakes