Initial revisions to JS
Refactoring JS
Merge branch 'master' into kenny

Merging John's addition of Bootstrap.
Merge pull request #8 from kplandes/kenny

Kenny