:timeout cannot be set to nil
Document installation of phantomjs via MacPorts.
Merge pull request #221 from sahilm/patch-1

Document installation of phantomjs via MacPorts.
Add Capybara 2 compatibility
Update to phantomjs 1.8.1
Merge branch 'master' of git://github.com/jonleighton/poltergeist

Signed-off-by: Mikael Henriksson <mikael@zoolutions.se>

Conflicts:
	README.md