Merge branch 'master' of github.com:captainclam/ss-swapsies

* 'master' of github.com:captainclam/ss-swapsies:
  locking dependencies
die die die
Merge branch 'master' of github.com:captainclam/ss-swapsies

* 'master' of github.com:captainclam/ss-swapsies:
  die die die
  locking dependencies