cleanup?
Merge branch 'master' of github.com:jamesrobb/icepet