Remove hack for stylish-haskell to ignore SOURCE pragmas
Formatting and minor renames
Merge pull request #44 from anchor/wip-remove-circuits

Remove circuits
Merge remote-tracking branch 'origin/master' into wip-repo-structure