Update brunch config
Update dev config
Update server
Merge branch 'master' of github.com:time-machine/cc