fixes
updated ansible/config files
Merge remote-tracking branch 'origin/jacco' into feature/django16-part3

Conflicts:
	source/posts/2013-11-20-django-16-part3.md