update to gitignore
merge gitignore
Merge branch 'master' into minerva
cleaned up, enabled vtwheel