Use cartodb visualization
Merge branch 'master' into cartodb-viz

Conflicts:
	viz/js/app.js
Merge branch 'master' into cartodb-viz
Merge pull request #35 from Datafable/cartodb-viz

Cartodb viz