deleted the returnFunction options so as to not pass to _.template
merged with master