Added Python 3.4 to the build process.
Merge branch 'master' into pr/672

Conflicts:
	.travis.yml