Fixed a buncha stuff that got left in from old commits.
Merge branch 'master' of gh:unscsprt/dropbucket
Whitespace.