1st of changes for RDF 1.1, before starting the email discussion
Merge branch 'master' of https://github.com/RDFLib/rdflib
Merge branch 'master' of https://github.com/RDFLib/rdflib into rdf11
Merge from pull of main default repos
Add travis-ci branch build instruction
Reformat code to PEP8, add py3-compatibility switches, add branch build to Travis-CI constellation.
Docs updates
merge from master
Merge branch 'master' of ../rdflib into rdf11
Small fixes and cleanup
Unskip RDF1.1 test failures, for info.
Fix for py2exe optimizer that discards docstrings
Merge pull request #257 from mar10/master

Fix for py2exe
Merge branch 'master' of github.com:RDFLib/rdflib into rdf11

Conflicts:
	rdflib/graph.py
	rdflib/plugins/serializers/trig.py
	rdflib/term.py
Clean up for a couple of tests
Merge branch 'master' of github.com:RDFLib/rdflib into rdf11
lists all quads for no arguments to ConjunctiveGraph.quads
Ensure a str is is passed to urlparse
Merge branch 'master' of https://github.com/RDFLib/rdflib
Merge branch 'rdf11' of github.com:RDFLib/rdflib
Thanks, Ivan.