Lots more updates
Merge branch 'master' of github.com:amplab/training

Conflicts:
	strata_2013/index.md
Lots of polishing.
Merge remote-tracking branch 'origin/master'
Merge commit '27c0874'

Conflicts:
	strata_2013/index.md