properly use partials in templates, add test, fixes #1504
Merge remote-tracking branch 'upstream/master' into fix-rspec-multiple-runs
Fix tests to check for new spec.rake syntax