Update nokogiri
Update shoulda
Merge pull request #3 from bootstraponline/master

Update shoulda