adding python 3.3 to travis configuration
Merge remote-tracking branch 'upstream/master'
Included latest commit from upstream.