modified database query
merged from upstream
added build dir
aggregate sql phase 2
committing to merge
fix conflicts
resetting config
Merge pull request #60 from alexanderson/master

Merged changes and changed db query for agg sql