Merge branch 'master' of github.com:RyanNielson/twitter-wars
added twitpic and instagram support