Merge pull request #14 from ua-eas/development

Merging development into Staging.
KATTS-2115 Add pwalters and bring up to date the kuali.conf template
Merge branch 'KATTS-2115' into staging
KATTS-2115 merging staging into master