Fixed lint errors
Merge pull request #124 from stianjensen/lintified

Fixed lint errors
Merge branch 'master' into remove_unused_scripts