Adding some speedups.
Merge branch 'development' of github.com:dchbx/gluedb into development
Fixing plan mapping.
Merge branch 'development' of github.com:dchbx/gluedb into development