Added Gondor and dotCloud support.
More README text
Unittests refactor
Fix MANIFEST.in
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.py