Fixes #117. Create a nice simulator
Merge branch 'master' of github.com:instedd/cdp
Updated Gemfile.loc