remove package name stutter, fix two gitfix problems
Merge pull request #1 from crawshaw/master

remove package name stutter, fix two gitfix problems