updated merge tool to p4merge
update gitconfig
removed unused vim items
Update go path
Add netflix
Typo
updated casks, bootstraps, and links
readd brew
Add flux
Update task