Codyedit for #440
Merge branch 'Littlefixes' of git://github.com/kcarcia/rSENSE into mergy

Conflicts:
	app/models/user.rb
Merge pull request #466 from mmcguinn/mergy

Merge for PR #463
-Changed the 'people' links to say 'users' in the title bar.
-Added some basic page title generation (#440 (1)).
-Fixed like text #440 (6)
-Fixed truncated names being shown in the delete dialog for edit menus.
Merge pull request #468 from mmcguinn/mm440

Mm440