Merge pull request #485 from samarthjain/master

More findbugs fixes.
Have delete go through optimize, fix basic delete scenarios for mutable secondary indexing, cast and invert column if necessary when index being used instead of table
Test fix