removed some cruft
Cleanup start
Fixup plugins a bit
Merge branch 'f/cleanup'
Ignore doc/tags