Unhealthily monolithic 2014 team update

This should have been around 10 separate commits but there was not
time to organise them properly. Must do better.