Revert CI config update.
Update travis config.
Remove C++11 features.
Merge branch 'master' of https://github.com/efritz/chinnu

Conflicts:
	.travis.yml