Merge branch 'develop'
Fix typo in .gitmodules.
Merge branch 'master' of github.com:hkirsman/tsitaatcom_site