fixed up some bugs with remove and adding stuff
Merge branch 'master' of https://github.com/mfiels/arm-chip-skateboard