Master branch should be nice and neat