--removed trailing whitespace on the last address line
Merge branch 'master' of https://github.com/aarongoodermuth/himalaya