Adds Svg support and more cleanup work
Fixes .gitignore
Merge conflicts