setup travisci
Merge branch 'master' of github.com:phillwilt/portfolio
merging into master