Fixed merge conflicts.
Fixed/completed all documentation in cosomosm.rst and core.py. Included a .. doctest-skipp-all command at the top of cosmosim.rst.

Conflicts:
	docs/cosmosim/cosmosim.rst
Added minor corrections to __init__.py in Millennium.
Beginning adding tools for email/text query completion alerting.
Made conditional statements a bit more pythonic. Fixed the docstring for run_sql_query.
Fixed up the logout() function such that it checks for username/password attributes. Also gave it a hard logout option which deletes the password from the keychain. Created a check_login_status() function which provides the user information about the success or failure of their login attempt.
Added a note in the docs/cosmosim/cosmosim.rst about logging in from a script rather than an interactive python session.
Added phase kwarg to both check_all_jobs and delete_all_jobs, which go through and check/delete (respectively) jobs with the appropriate phase. If no phase kwarg provided, ALL jobs are operated on. Renamed check_query_status to check_job_status.
Added a job cleanup for check_login_status() so that jobs don't pile up.
Fixed download() docstring.
Fixed cosmosim.rst formatting.
Completed adding email/text job alerts as an option for run_sql_query() in cosmosim/core.py.
Fixed a few errors in docstrings, wrapped a few lines, and changed the kwarg hard to deletepw.
Minor changes.
Took out service provider information for the moment.
Fixed spelling mistake for deletepw.
Fixed changelog.
Restored changelog.
Fixed python2/3 imports by going through six.
Added regex tablename matching support for delete_all_jobs(). Also updated the cosmosim.rst with examples of usage.