Updated for 14.04 / Docker 1.0
Merge pull request #1 from markdingram/master

Updated for 14.04 / Docker 1.0