add slides from @katewatkins @mojodna and @almccon on cartocss tips
Merge branch 'master' of https://github.com/skorasaurus/sotmus2014 into gh-pages
update the html