updated
Merge branch 'master' of https://github.com/kingsleyh/redfighter
faye stuff