Merge pull request #1 from mschuetz/master

merge back upstream
modfied travis.yml according to their help docs

In the Travis help, they say that you should do an "apt-get update" before installing packages and use "apt-get install" with the -y option
Merge pull request #3 from tabascoeye/master

sticking to the Travis documentation