Update to use Ubuntu 14.04. Fixes #87
Merge pull request #89 from andrewsomething/master

Update to use Ubuntu 14.04. Fixes #87
fix merge conflicts
Merge branch 'progrium-master'