Merge pull request #496 from jlipps/master

FirefoxOS support
fix reset.sh and add files to linting
fixed previously unlinted file