minor plugin fixes
fix repeated ssl line adds to nginx configfiles, closes #317
Merge branch 'master' into 0.6