Updated file name. Fixes #48
Update readme.txt re #48
Finished changelog for 1.1.1. Fixes #38
Merge branch 'master' into shortcode