updated demo to use sqlalchemy
Merge remote-tracking branch 'origin/master'
Macros don't need an `import *` in addition to `import macros`