some more regex cleanup
Merge branch 'features/duplicate_and_template_handling' of github.com:travis-ci/travis-worker into features/duplicate_and_template_handling

merge in some awesomeness from Henrik

Conflicts:
	lib/travis/worker/virtual_machine/blue_box.rb