expand links with embed.ly
add highlight
fix commands not being removed
Merge branch 'patch/02' into feature/highlight
cache highlight
Merge branch 'master' of https://github.com/gaving/shout into gaving/master

Conflicts:
	client/js/shout.templates.js
	defaults/config.js
Merge branch 'gaving/master' into develop