It's been a minute... aka, a long time.
Merge branch 'master' of https://github.com/lmacken/kettlefish into lmacken-master

Conflicts:
	kettlefish.py
Thump!
Merge branch 'master' of https://github.com/lmacken/kettlefish into lmacken-master
Merge branch 'lmacken-master'

Conflicts:
	kettlefish.py