Lets get a successful build on travis
Merge branch 'master' of github.com:McKizzle/AoS