5.4 with some code refactoring and translation fixes

git-svn-id: https://plugins.svn.wordpress.org/jm-twitter-cards/trunk@1030907 b8457f37-d9ea-0310-8a92-e5e31aec5664