Merge pull request #15 from michaelck/mktemplates

MK - moved media location on tweet template
Geo location icon
Merge remote-tracking branch 'upstream/master' into mktemplates