begin INTEGRATION
bug fixes
massive refactor of ORM. You guys, I'm like, seriously
cleaning code and making features work properly
added ProxSearchTask
preparing for master merge
fixing up conflicts
a lot of tweaking to get things working