merging forks

changed the import to work on my machine original line is from flask.ext.sqlalchemy import SQLAlchemy