Merge branch 'master' of github.com:dellsystem/mcmun-2014
Fix syntax error in mcmun.js

This is the last thing for #6 I promise