folder updates
add conf and test
ignore swp files
update with new company