Merge from gh-pages... doh!
Merge branch 'master' of github-ubersoldat:ubersoldat/FirefoxOS