End june 2014 tidyup

@Bjwebb pushing this through, so we can generate new dev, and then establish actions for Monday