Poltergeist on Travis
Use PhantomJS, not Poltergeist
No monkey patch for Travis
Skip alert popup confirmation when using PhantomJS
Probably fix 1 test which was broken on Phantom
No need to use xvfb
Organization cleanup
Move payment related steps from org -> payment
Cache Travis Bundle
Merge branch 'develop' of github.com:sharetribe/sharetribe into develop
Merge pull request #141 from sharetribe/organization-cleanup

Organization cleanup
Merge pull request #138 from sharetribe/feature/phantom-on-travis

Phantom on Travis
Merge pull request #140 from sharetribe/feature/travis-bundle-cache

Speed-up Travis!
Merge branch 'master' into develop
Some quick updates made directly to master
Added check & cross to email confirmed status in account settings instead of current "confirmed / pending", fixed minor layout bugs
Text "pending" instead of cross icon in confirmation column when status is pending
Remove magics
Merge pull request #143 from sharetribe/account-settings-email-fix

Account settings email fix
Merge branch 'master' into develop

Conflicts:
	app/helpers/application_helper.rb
Merge pull request #145 from sharetribe/develop

Develop to master