Merge basic config from peepcode screencast with Janus