Changes from last night

I dunno lots
Merge branch 'master' of https://github.com/byroncoetsee/WIL2014