Merge branch 'master' of github.com:gruns/furl

Conflicts:
	furl/furl.py
	furl/omdict1D.py
	tests/test_furl.py
Merge branch 'master' of github.com:slick666/furl