Started adding SQLAlchemy
Merge branch 'master' of https://github.com/chrisrodz/AEE-Maps

Conflicts:
	aeemaps.py
sqlalchemy modification
misc changes
Merge branch 'master' of https://github.com/chrisrodz/AEE-Maps

Conflicts:
	aeemaps.py
Misc changes