Fixed the javascript tests.
Merge remote-tracking branch 'upstream/master'
Added dollar sign to window.alert statements
Merge pull request #111 from gavia/master

Fixed the javascript tests
Updated commenting
Consolidate refresh into single button
Merge pull request #112 from gavia/master

Updated commenting
Merge upstream changes
Merge pull request #113 from thewheat/single-refresh

Single refresh button