Merge branch 'master' of git://github.com/JasonBarnabe/stylish
Merge branch 'master' of github.com:LouCypher/stylish