Added more templates, add defualt values to map.jinja for use in file states
Makefile and map.jinja typo
Merge branch 'master' into dev
Updated README