Updated to Ubuntu 14.04
Merge pull request #2 from bobbywarner/master

Updated to Ubuntu 14.04