Set the default suffix to something more culturally appropriate
Fix readme, fix check on suffix/prefix in use
Add "None" as option to use short mode
Adjust readme to reflect -s="None" will use short mode
Merge pull request #139 from andymcc/sprint

Merged automatically by jenkins after successful gate test