updated the diff tool
added settings for NetBeans PHP
added ssh config file, mostly to pass proxies