upgrading to ubuntu 14.04
Merge pull request #2 from sherzberg/upgrade-ubuntu

upgrading to ubuntu 14.04