Merge branch 'release/0.3.5' into develop
no message
Revert "no message"

This reverts commit f13d615307144a338fb56c038a672738766ee52c.
conf phantomJS
specify exec location
settings are happy
add a config switch
hopefully test be ok
and travis happy
fix how path is read
KeyError mock config now throw
unit test is now good
bump selenium
version has better support
phantomjs happy
0.3.6 changes
Merge branch 'release/0.3.6'