Indentation fix
Changes to try and merge
Merge pull request #27 from emsiepopples/master

Amalgamated a few functions and edits to reflect this
Minor cosmetic changes and queryDb function now in enron.py
Merge pull request #28 from ilanfri/master

Minor cosmetic changes and queryDb function now in enron.py
Merge pull request #29 from elenagr/master

Upload files
Two minor changes to update the column