made some changes
Merge branch 'db' of https://github.com/lnhubbell/tweetTrack into db

Conflicts:
	streamScript/twitter_stream.py
removed print statement
add imports
set sql limit and pickle dataset
wrote build matrix and build vocab functions
pickle the X and Y arrays
finished merge and removed the pickles which were too big for github
Merge branch 'db' of https://github.com/lnhubbell/tweetTrack into db

Conflicts:
	streamScript/locations/prep_training_data.py
	streamScript/send_data.py