Changes for 14.04 ubutu, mostly cleanup.