Initial Commit
Adds python 2.6 support
Merge branch 'master' of github.com:painterjd/python-marconiclient

Conflicts:
	tox.ini