Merge pull request #127 from cptmashek/master

Cleanup, mostly.
Merge pull request #128 from cptmashek/master

Stupid.
Merge pull request #129 from cptmashek/master

Moar
Merge branch 'master' of github.com:scoundrels/scrib