styl refactor part 1
styl refactor done
Merge branch 'master' into gh-pages