style changes
Merge branch 'master' of https://github.com/Supernova-Team/cassandra-presentations

Conflicts:
	cassandra-summit-2014/cassandra-summit-2014_old.html