Some JS conversions in assets/javascripts. (And some formatting here and there)
Forgot to remove an alert I was using for testing
Merge pull request #1605 from arkon/js-assets

Some JS conversions in assets/javascripts.