Massive changes everywhere
Merge branch 'master' of http://github.com/rbryan/psychic-dangerzone