Modified OSM attribution
Removed cdb.init
copy => html
Merge pull request #89 from CartoDB/osmAttr

updated osm attribution
Merge branch 'master' into removeCdbInit

Conflicts:
	t/03-cartodbjs-ground-up/lesson-2/jsfiddle_demo_layercontrols/demo.js
	t/03-cartodbjs-ground-up/lesson-2/jsfiddle_demo_multilayer/demo.js
	t/03-cartodbjs-ground-up/lesson-2/jsfiddle_demo_toggles_and_slider/demo.js
Merge branch 'removeCdbInit'
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:CartoDB/academy into gh-pages