fix issue with rails install generator attempting to create slim/haml templates when erb is needed instead
Merge branch 'master' of github.com:zurb/foundation
Merge branch 'master' of github.com:zurb/foundation