Cleaned up / reordered
Merge branch 'master' of https://github.com/Wolskie/genfw