Merge branch 'master' of github.com:stormuk/storm-twitter-for-wordpress

Conflicts:
	README.md

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@626064 b8457f37-d9ea-0310-8a92-e5e31aec5664
Test change

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@626075 b8457f37-d9ea-0310-8a92-e5e31aec5664
Improve WP readme

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@626076 b8457f37-d9ea-0310-8a92-e5e31aec5664
Update stable version

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@626080 b8457f37-d9ea-0310-8a92-e5e31aec5664
Make caching sensible - not debuggy.

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@628797 b8457f37-d9ea-0310-8a92-e5e31aec5664
Correct plugin file details

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@628798 b8457f37-d9ea-0310-8a92-e5e31aec5664
Update to 1.0.4

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@628885 b8457f37-d9ea-0310-8a92-e5e31aec5664
Bump to 1.0.5, fix documentation further

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@628892 b8457f37-d9ea-0310-8a92-e5e31aec5664
Test change

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@631675 b8457f37-d9ea-0310-8a92-e5e31aec5664
Add link to code example in the readme files

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@631676 b8457f37-d9ea-0310-8a92-e5e31aec5664
Bump version numbers

git-svn-id: http://plugins.svn.wordpress.org/oauth-twitter-feed-for-developers/trunk@631677 b8457f37-d9ea-0310-8a92-e5e31aec5664
Fix merge conflicts from git-svn