Moved data into data.coffee and into objects.
Made return value of calculate nicer.
Added comments and removed logging.
Merge branch 'master' into gh-pages