pushing
Merge branch 'master' of http://github.com/kevinisageek/phenny

wut?
cleanup