Update .travis.yml
Update .travis.yml
Removed leftover file
Fixed bug that crashed process when --serve'ing
Merge branch 'hotfix'
Merge branch 'master' into minor-rev