Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Updating to less.js 1.7.4
Add rake task for jekyll serve command
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Add rake task for jekyll serve command
Merge branch 'master' into gh-pages

* master:
  Add rake task for jekyll serve command