push for travis
another
Merge branch 'master' of https://github.com/ddavison/dot-hunt

* 'master' of https://github.com/ddavison/dot-hunt:
  push for travis

Conflicts:
	.idea/workspace.xml