Tortoise: minor cleanup
correct my misunderstanding of CoffeeScript
Merge remote-tracking branch 'origin/headless' into tortoise
minor cleanup
Merge remote-tracking branch 'origin/headless' into tortoise
Merge remote-tracking branch 'origin/headless' into tortoise
Merge branch 'headless' into tortoise
Merge remote-tracking branch 'origin/headless' into tortoise
relocate test to right package
Merge remote-tracking branch 'origin/headless' into tortoise
Tortoise: rename TestTortoise to TestDocking
Merge branch 'headless' into tortoise
special Travis config for tortoise branch
Merge remote-tracking branch 'origin/headless' into tortoise
Merge remote-tracking branch 'origin/headless' into tortoise
Merge remote-tracking branch 'origin/headless' into tortoise
Merge remote-tracking branch 'origin/headless' into tortoise

Conflicts:
	.travis.yml
Merge remote-tracking branch 'origin/headless' into tortoise
Merge remote-tracking branch 'origin/headless' into tortoise
Merge remote-tracking branch 'origin/headless' into tortoise