local changes I dont remember
Merge branch 'local'
Added an option to remove some things from the resulting archive