Merge pull request #486 from lurch/patch-1

Update .travis.yml to use python3.3
.travis.yml: Use gcc-4.7 to avoid broken codegeneration and failed tests.
Merge remote-tracking branch 'upstream/master' into patch-1

Conflicts:
	.travis.yml