make swapper less shitty
Merge remote-tracking branch 'kyle/master'