Merge pull request #14 from aselbie/master

(fix) Change to git strategy for Heroku deployment
rebase
Merge pull request #15 from biversen21/master

rebase
smooths refresh and fixes bug with null articles
Merge pull request #16 from biversen21/master

smooths refresh and fixes bug with null articles
(feat) adds twitter file to server/components
(feat) sets up headline parsing and tweet stream, adds geolocation data to article DB
(fix) fixes syntax errors in twitter/twitter.js
(fix) adds back in fetchArticle function. oops.
(fix) 9(syntax error) changed expression to conditional on line 60, news.aggregator.js
(fix) refining twitter geolocation
Merge pull request #17 from TessMyers/master

(feat) adds tweet geolocation data to database for each article
(fix) adds twit and keyword-extractor to package.json
Merge pull request #18 from TessMyers/master

(fix) adds twit and keyword-extractor to package.json
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)