Modularized server for better organization
Fixed watcher bug
Merge branch 'master' of https://github.com/nathandinsmore/amber