changed comment syntax-y things
Merge branch 'master' of git://github.com/WLCSC/firefight into upstream
Merge branch 'upstream'