Added cbcffm client to emulator
Merge branch 'master' of heroku.com:idp-emulator
cleaning up emacs files