add other toplevel urlpatterns
add idea-IDE files to gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
remove prints
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix TypeError on HMAC call
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	mezzanine/generic/templatetags/disqus_tags.py
strip SCRIPT_NAME from slug
read PAGES_SLUG from settings
fix for slug-striping
merge to upstream
remote server support in static_proxy