Renamed 'simple-inner' to 'inner'. Added inner-full-width and inner-no-sidebar templates.
Merge branch 'develop' of git://github.com/johnshopkins/machado into develop