Merge branch 'develop' into release/2.3rc1
updated CHANGELOG.txt
bumped version to 2.3rc1.post0
trying to fix travis
added argparse to travis config
removed extra slash as Django documentation dictates that STATIC_URL must include the trailing slash, therefore the url being built contained a double slash where it shouldn't
Merge pull request #1291 from zandeez/develop

removed extra slash in CMS_ADMIN_ICON_BASE
trying out irc notifications for travis
Fixed requirements in docs
Added Andrew Cassidy (@zandeez) to AUTHORS for b152c8e0141b8451e9911dbb44b4ca20630c8083
menu explanations for the docs
improved markup
Merge pull request #1295 from evildmp/YAMD

menu explanations for the docs
fixed docs tests fail fail fail
Merge pull request #1297 from evildmp/YAMD

fixed docs tests fail fail fail
test for #1296 (apphook urls breaking on home tree)
Fixed #1296
Let's get rid of CMS_FLAT_URLS!
fixed typo
Merge pull request #1298 from ojii/feature/apphooks-under-home

fixed #1296 (apphook url mess when a child of home has the home's slug in it's slug)