Fix typo in 'or' text joiner.
Add separate configs for prod and devel to minimize the amount of settings needed in the untracked local_settings file.  Check in the prod apache config for reference.
Merge branch 'master' of https://github.com/UnicycleLabs/intouch