Merge remote-tracking branch 'origin/master'
Added coffeescript support and reordered some sections