CSAW 2014 leftovers, again
Merge branch 'master' of github.com:CrockAgile/CSAW2014