automatically updated dependencies
Fixed bootstrap gem to version 2
Merge pull request #543 from theodi/update-dependencies-2013-08-28

automatically updated dependencies