Fixed travis-ci

Closes #9
Fixed travis-ci branch
Fixed travis-ci
Fixed travis-ci
Fixed travis-ci
Fixed travis-ci
Fixed travis-ci
Fixed travis.ci (finally)
Added more makefiles

Closes #11