Made minor edits
Changed to include cartodb.js instead of uncompressed
Merge branch 'cdbjs_ground_up' of https://github.com/CartoDB/academy into cdbjs_ground_up