Fix credits on the fly using some fancy regex

We're opting to store the credits in the database instead of the shortcode
Merge pull request #217 from INN/fix-captions

Fix credits on the fly using some fancy regex
Merge pull request #214 from INN/master

Sync develop against master