Update README.md

Add info from various PRs
Some typo fix
Some additions

README.md

@@ -6,7 +6,7 @@ A collection of awesome penetration testing resources
 
 - [Online Resources](#online-resources)
   - [Penetration Testing Resources](#penetration-testing-resources)
-  - [Shellcode development](#shellcode-development)
+  - [Exploit development](#exploit-development)
   - [Social Engineering Resources](#social-engineering-resources)
   - [Lock Picking Resources](#lock-picking-resources)
 - [Tools](#tools)
@@ -22,7 +22,7 @@ A collection of awesome penetration testing resources
   - [DDoS Tools](#ddos-tools)
   - [Social Engineering Tools](#social-engineering-tools)
   - [OSInt Tools](#osint-tools)
-  - [Anonimity Tools](#anonimity-tools)
+  - [Anonymity Tools](#anonymity-tools)
   - [Reverse Engineering Tools](#reverse-engineering-tools)
 - [Books](#books)
   - [Penetration Testing Books](#penetration-testing-books)
@@ -48,9 +48,10 @@ A collection of awesome penetration testing resources
 * [PTES](http://www.pentest-standard.org/) - Penetration Testing Execution Standard
 * [OWASP](https://www.owasp.org/index.php/Main_Page) - Open Web Application Security Project 
 
-#### Shellcode development
-* [Shellcode Tutorials](http://www.projectshellcode.com/?q=node/12) - Tutorials on how to write shellcode
+#### Exploit development
+* [Shellcode Tutorial](http://www.vividmachines.com/shellcode/shellcode.html) - Tutorial on how to write shellcode
 * [Shellcode Examples](http://shell-storm.org/shellcode/) - Shellcodes database
+* [Exploit Writing Tutorials](https://www.corelan.be/index.php/2009/07/19/exploit-writing-tutorial-part-1-stack-based-overflows/) - Tutorials on how to develop exploits
 
 #### Social Engineering Resources
 * [Social Engineering Framework](http://www.social-engineer.org/framework/) - An information resource for social engineers
@@ -71,6 +72,9 @@ A collection of awesome penetration testing resources
 * [Metasploit Framework](http://www.metasploit.com/) - World's most used penetration testing software
 * [Burp Suite](http://portswigger.net/burp/) - An integrated platform for performing security testing of web applications
 * [ExploitPack](http://exploitpack.com/) - Graphical tool for penetration testing with a bunch of exploits
+* [BeeF](https://github.com/beefproject/beef) - The Browser Exploitation Framework Project
+* [faraday](https://github.com/infobyte/faraday) - Collaborative Penetration Test and Vulnerability Management Platform
+* [evilgrade](https://github.com/infobyte/evilgrade) - The update explotation framework
 
 #### Vulnerability Scanners
 * [Netsparker](https://www.netsparker.com/communityedition/) - Web Application Security Scanner
@@ -92,6 +96,7 @@ A collection of awesome penetration testing resources
 * [netsniff-ng](https://github.com/netsniff-ng/netsniff-ng) - A Swiss army knife for for network sniffing
 * [Intercepter-NG](http://intercepter.nerf.ru/) - a multifunctional network toolkit
 * [SPARTA](http://sparta.secforce.com/) - Network Infrastructure Penetration Testing Tool
+* [DNSDumpster](https://dnsdumpster.com/) - Online DNS recond and search service
 
 #### Wireless Network Tools
  * [Aircrack-ng](http://www.aircrack-ng.org/) - a set of tools for auditing wireless network
@@ -124,9 +129,10 @@ A collection of awesome penetration testing resources
 #### OSInt Tools
 * [Maltego](http://www.paterva.com/web6/products/maltego.php) - Proprietary software for open source intelligence and forensics, from Paterva.
 
-#### Anonimity Tools
+#### Anonymity Tools
 * [Tor](https://www.torproject.org/) - The free software for enabling onion routing online anonymity
 * [I2P](https://geti2p.net) - The Invisible Internet Project
+* [Nipe](https://github.com/HeitorG/nipe) - Script to redirect all traffic from the machine to the Tor network.
 
 #### Reverse Engineering Tools
 * [IDA Pro](https://www.hex-rays.com/products/ida/) - A Windows, Linux or Mac OS X hosted multi-processor disassembler and debugger
@@ -241,11 +247,19 @@ A collection of awesome penetration testing resources
 * [Troopers](https://www.troopers.de) - Annual international IT Security event with workshops held in Heidelberg, Germany
 * [Hack3rCon](http://hack3rcon.org/) - An annual US hacker conference
 * [ThotCon](http://thotcon.org/) - An annual US hacker conference held in Chicago
-* [LayerOne](http://www.layerone.org/) - An annual US security conerence held every spring in Los Angeles
+* [LayerOne](http://www.layerone.org/) - An annual US security conference held every spring in Los Angeles
 * [DeepSec](https://deepsec.net/) - Security Conference in Vienna, Austria
 * [SkyDogCon](http://www.skydogcon.com/) - A technology conference in Nashville
 * [SECUINSIDE](http://secuinside.com) - Security Conference in [Seoul](http://en.wikipedia.org/wiki/Seoul)
 * [DefCamp](http://defcamp.ro) - Largest Security Conference in Eastern Europe, held anually in Bucharest, Romania
+* [AppSecUSA](https://appsecusa.org/) - An annual conference organised by OWASP
+* [BruCON](http://brucon.org) - An annual security conference in Belgium
+* [Infosecurity Europe](http://www.infosecurityeurope.com/) - Europe's number one information security event, held in London, UK
+* [Nullcon](http://nullcon.net/website/) - An annual conference in Delhi and Goa, India
+* [RSA Conference USA](http://www.rsaconference.com/) - An annual security conference in San Francisco, California, USA
+* [Swiss Cyber Storm](https://www.swisscyberstorm.com/) - An annual security conference in Lucerne, Switzerland
+* [Virus Bulletin Conference](https://www.virusbtn.com/conference/index) - An annual conference going to be held in Denver, USA for 2016
+* [Ekoparty](http://www.ekoparty.org) - Largest Security Conference in Latin America, held annually in Buenos Aires, Argentina
 
 
 ### Information Security Magazines
@@ -269,6 +283,15 @@ A collection of awesome penetration testing resources
 * [Python Programming by @vinta](https://github.com/vinta/awesome-python) - General Python programming
 * [Android Security](https://github.com/ashishb/android-security-awesome) - A collection of android security related resources
 * [Awesome Awesomness](https://github.com/bayandin/awesome-awesomeness) - The List of the Lists
+* [AppSec](https://github.com/paragonie/awesome-appsec) - Resources for learning about application security
+* [CTFs](https://github.com/apsdehal/awesome-ctf) - Capture The Flag frameworks, libraries, etc
+* [Hacking](https://github.com/carpedm20/awesome-hacking) - Tutorials, tools, and resources
+* [Honeypots](https://github.com/paralax/awesome-honeypots) - Honeypots, tools, components, and more
+* [Infosec](https://github.com/onlurking/awesome-infosec) - Information security resources for pentesting, forensics, and more
+* [Malware Analysis](https://github.com/rshipp/awesome-malware-analysis) - Tools and resources for analysts
+* [PCAP Tools](https://github.com/caesar0301/awesome-pcaptools) - Tools for processing network traffic
+* [Security](https://github.com/sbilly/awesome-security) - Software, libraries, documents, and other resources
+* [Awesome List](https://github.com/sindresorhus/awesome) - A curated list of awesome lists
 
 
 ### Contribution