Merge pull request #45 from mkowoods/master

consolidate js