Remove reference in Swap.h to the tree-based containers, which no longer exist.
For Travis CI - switch CI build to use OS X build environment.