allow plugin script to look for plugins in symlinks
Fix template path from clearing out templates
Default to site/templates not priv/templates
Merge branch 'master' into ws