Include all includes
Include them easier
Init some stuf
Merge remote-tracking branch 'origin/master' into travis-ci