Merge pull request #46 from grahamb/sfu-develop

try again with the Gemfile.lock for 1.9.3