lots of string munging
Merge branch 'master' of github.com:thabofletcher/psychic-dangerzone