Fixing jslint
Fix for 'enabled' descriptor property only working as a string
Merge remote-tracking branch 'upstream/master'
Fixing bug for proxy test always running on Firefox
Adding support for configurable ignore-ssl-errors for phantomjs, ignore true by default
Restoring .gitignore and .npmignore to previous state
Merging conditions for setting proxy capabilities
Merge pull request #131 from pranavparikh/master

Fix for 'enabled' descriptor property, capability manager for proxy test and support for configurable ignore-ssl-errors for phantomjs