Bump version to 6.1.7
Merge branch 'master' of heroku.com:gittip

Conflicts:
	www/version.txt