Silly git and it's silly not knowing exactly what I intended to move around...
Merge branch 'master' of https://github.com/ged-lab/2013-srop-summer