Updated for Ubuntu 14.04 and docker 1.0

A few minor changes to get the container to build properly