Merge pull request #18 from Swap-Meet/marissa

Marissa minor changes
added linters to grunt-serve and fixed lint issues
Merge pull request #19 from Swap-Meet/gruntwatchfix

added linters to grunt-serve and fixed lint issues
changes to modules
changes to grunt files Merge branch 'dev' into marissa