Remove trailing whitespace
Stop using the default bottle app

This helps potential for composability and not polluting the namespace
Break some long lines
Remove commented out code
Merge pull request #22 from ezephyr/fixes

Some various small fixes and improvements