ability to break out collections, removed a swap file, some whitesapce fixes
Merge pull request #28 from willtp87/7.x

ability to break out collections