Merge pull request #66 from marianmosley/capybara-upgrade

Upgrade capybara to version 2.4.1
take out test for placeholder disappearing beacuse it is done by html and move some things into before block
Merge branch 'develop' of https://github.com/AgileVentures/LocalSupport into style-edit
change scenario for adding unregistered user as charity admin to expect error message in the flash
impelemented steps for additional administrator email error message in flash