removed -F option for less
encrypt/decrypt aliases
Merge branch 'master' into bender

* master:
  encrypt/decrypt aliases
  removed -F option for less