Merge pull request #1 from hugovk/block-without-reporting-as-spam

Add menu option to block a user without reporting as spam
Merge branch 'master' of https://github.com/hugovk/Tweetian
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Flickr now SSL-only http://code.flickr.net/2014/04/30/flickr-api-going-ssl-only-on-june-27th-2014/
Merge pull request #159 from hugovk/flickr_ssl

Flickr now SSL-only