Final removal of cloudfuji stuff
Merge pull request #162 from jrgifford/master

Removed _bushido-faye