Linting

I pulled in some old code that wasn't linted. Fixed now. Can't say I'm loving the weird jslint indentation rules tho. But consistency beats taste. :)