Include new_method in Travis CI

The new method is regressed now in Travis CI. I also did more
refactoring.
Merge branch 'master' of github.com:mohamed/ITL

Conflicts:
	.travis.yml