Merge pull request #1 from andreyrd/master

Added link shortener plugin
Merge pull request #1 from nickvanw/master

Update from upstream