Remove old configs
Better swap behavior
Update gem path
Merge latest default config changes