Added Travis CI
Broke something on purpose, fix to follow
Fixed, trying to see Travis CI
Merge remote-tracking branch 'christian/7.x' into 7.x-code-standards

Merge in the Travis integration, to ensure it runs.