Create default user locations record
Minor code layout changes and variable name changes
Make LETTER the default paper
Remove unnecessary include
Merge pull request #8 from KwaMoja/develop

Develop
Merge pull request #486 from timschofield/develop

Develop