Merge pull request #1 from proppy/master

initial import
travis: update keys and project