Merge branch 'master' into dev

Conflicts:
	data/load_2grams.py
Merge branch 'master' into dev

Conflicts:
	data/load_2grams.py
ignoring virtualenv folder
tweaked web app
load mysql database script
increased tweet count to 100 per search
added ENV to .gitignore
Merge branch 'master' into dev