WIP
Merge branch 'master' of github.com:tachang/django-shortcodes

Conflicts:
	shortcodes/parsers/caption.py
Adding caption shortcode