Merge pull request #850 from lonelyplanet/chee/controller.js

A working version of controller.js%%.coffee