Merge branch 'master' into josh's-branch
Refactoring to Backbone/Underscore JS

Refactored much of the existing code base into more friendly Backbone
JS and Underscore JS frameworks
Merge branch 'josh's-branch'
Merge branch 'master' into josh's-branch
Merge branch 'josh's-branch'