Fix jshint errors after merge and add jshint to makefile
move more files over to use genCSS