Rails311

bring this branch up to date against what's in vendored source in cfme repo.