Cleanup and update to ubuntu 14.04