Fixing join() call
Merge branch 'master' of https://github.com/justinwalsh/todaycms