updating submodule ref
extra checkout master
Merge remote-tracking branch 'upstream/master'
coffee script minor changes