Simplify setup
Remove Fluff
Merge pull request #1 from eile/master

Cleanups