Update template paths and template path helper
Merge branch 'master' of github.com:rapid7/marionette.carpenter

Conflicts:
	dist/controllers/table_controller.js
	dist/controllers/table_controller.js.map
	src/entities/paginated_collection.coffee