moved to global style, misc updates
Merge branch 'master' of github.com:continu/styleguide