Merge branch 'develop'
no tabs in travis.yml
travis understands this?
Now maybe?
licenses
will it blend.... umm work?
derp i derp
?
Merge branch 'master' into develop