customizing styleguide a bit
Merge remote-tracking branch 'origin/master'

* origin/master:
  working on style guide
  modifying styleguide
  working on jshint options
  moving things around