Revert "Updating build configuration. Trying it out."

This reverts commit aa4900106c57a9dc188e2711cdd5e67d72a1576c.

Conflicts:
	.travis.yml