! Tweak some of the wording in the profile menu

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Should hopefully clear up ambiguity for the user given our internal vs displayed terminology and fix #1278 in the process. Hopefully.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1344 from Arantor/release-2.1

More fixes