noseplugin parameter to add extra desired capabilities as a json blob
updated email address for contrib
updating version to 0.1.7
attempt to fix travis build - removing custom install phantomjs in favor of the provided version
Merge master into test_runner

Conflicts:
	holmium/core/noseplugin.py