Reindented?
Removed extraneous bullshit
Merge branch 'master' of github.com:the-ben-waters/pistrion

merging