Fixed npm bleeding upgrade script
Updated and merged brew and cask files