Keeping the response.
Version = 0.2.6
Merge branch 'master' of git://github.com/rdgreis/python-digitalocean into rdgreis-master

Conflicts:
	setup.py
Merge branch 'rdgreis-master'

Conflicts:
	setup.py