Checkpointing
Tests are passing except merged mappings
Merged mappings work in tests
Added support for compound templates in tests
Handle the case where templates dir does not exist
Update travis to test against node 0.10
Added fix for template_dir
Updated webserver test
Handling fs-watch errors during tests
Updated README