Add menu option to block a user without reporting as spam
Support both http and https Flickr URLs
Merge branch 'https-flickr' of git://github.com/hugovk/Tweetian into master
Fixes 9eaf0ee for Harmattan
merging block user