rollbacked 2 commits; rake is still green
Locked anjlab-bootstrap-rails down to 2.3.1.2; rake is green
resync'ed with parent repo
Merge branch 'master' of git://github.com/andrew/24pullrequests
Updated Gemfile.lock file
Merge pull request #270 from jasnow/master

Updated Gemfile.lock file