revert
revertderp again
revertderp again again
istablet not needed
Merge pull request #12 from benjamingoodwin/cm-10.1

MASSIVE MASSIVE n00b derps. :(