fixing news aggregator merge conflict
Changes made to map module
adding tweets location functionality
Adds semi-colon for angular syntax

Hi merge me
(Fix) Merge conflicts
Merge pull request #21 from shanswami/master

(Feat) Adds d3 tweet highlighting (I hope)