Work on making jslint happy
Merge with remote