remove makefile that added from previous merge conflict
fixed some typos, ran jshint and reformatted for clarity
consolidates jshint targets since they aren't being run separately. cleans up some tasks.
update metadata and build.yml to reflect latest changes in 1.5.0 branch