If current_user responds to firstname, present that since it's friendlier; otherwise, display username
Merge branch 'feature/smart-logout' into rails3
Bump patch version to 2.1.7