Taken away formattertests and unused imports
fixed merge conflicts
Merge branch 'master' of github.com:buren/enduro into refractor_stuff
Merge pull request #92 from buren/refractor_stuff

Refractor stuff