Merge branch arspecs

includes some unrelated/required jslint JS fixes