Updating to twitter bootstrap 2.3.1
Version bumped to 2.2.5
Merge pull request #536 from ericfreese/master

Updating to bootstrap v2.3.1