template path
Merge remote-tracking branch 'origin/master'

Conflicts:
	kousoku-wordpress/recipes/opsworks-datasource.rb