Trying to clean up less
Merge branch 'master' of github.com:themeforce/framework