Remove some junk
Merge branch 'master' of github.com:gjtorikian/testing