Attempt at travis-ci building
Merge branch 'master' of github.com:nikkiii/logupload