some rspec work and link fix in email
Merge branch 'master' of github.com:schleary/p-patch-Salmon