Add Python2 shebang
Remove trailing whitespace
Merge pull request #1 from poke/improvements

poke's Fancy Miscellaneous Improvements