Fixed some stuff, who cares?
Merge branch 'master' of http://github.com/nickthename/py-sticks

Liscence changes and main changes don't mix, I guess.