Merge pull request #5 from jamesjenkinsyates/master

HAML and Offer Partial
Facebook and Google log on and it is tested with Cucumber