Whitespace fixes
Upgrade to shake 0.10 and refactor commandline processing

Closes #13
Code cleanup