Updated Travis CI configuration
Merge pull request #14 from jplock/jp-travis

Updated Travis CI configuration
Updated Dockerfile

Updated Dockerfile to 1.6.0