Merge branch 'rshipp-master'

README.md

@@ -23,6 +23,7 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
   - [Windows Utils](#windows-utils)
   - [DDoS Tools](#ddos-tools)
   - [Social Engineering Tools](#social-engineering-tools)
+  - [OSInt Tools](#osint-tools)
   - [Anonimity Tools](#anonimity-tools)
   - [Reverse Engineering Tools](#reverse-engineering-tools)
 - [Books](#books)
@@ -66,6 +67,7 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
 
 #### Lock Picking Resources
 * [Schuyler Towne channel](http://www.youtube.com/user/SchuylerTowne/) - Lockpicking videos and security talks
+* [/r/lockpicking](https://www.reddit.com/r/lockpicking) - Resources for learning lockpicking, equipment recommendations.
 
 ### Tools
 #### Penetration Testing Distributions
@@ -102,6 +104,7 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
 
 #### Wireless Network Tools
  * [Aircrack-ng](http://www.aircrack-ng.org/) - a set of tools for auditing wireless network
+ * [Kismet](https://kismetwireless.net/) - Wireless network detector, sniffer, and IDS
 
 #### SSL Analysis Tools
 * [SSLyze](https://github.com/nabla-c0d3/sslyze) - SSL configuration scanner
@@ -125,6 +128,9 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
 #### Social Engineering Tools
 * [SET](https://github.com/trustedsec/social-engineer-toolkit) - The Social-Engineer Toolkit from TrustedSec
 
+#### OSInt Tools
+* [Maltego](http://www.paterva.com/web6/products/maltego.php) - Proprietary software for open source intelligence and forensics, from Paterva.
+
 #### Anonimity Tools
 * [Tor](https://www.torproject.org/) - The free software for enabling onion routing online anonymity
 * [I2P](https://geti2p.net) - The Invisible Internet Project
@@ -174,6 +180,7 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
 #### Malware Analysis Books
 * [Practical Malware Analysis by Michael Sikorski, Andrew Honig, 2012](http://www.nostarch.com/malware)
 * [The Art of Memory Forensics by Michael Hale Ligh and others, 2014](http://wiley.com/WileyCDA/WileyTitle/productCd-1118825098.html)
+* [Malware Analyst's Cookbook and DVD by Michael Hale Ligh and others, 2010](http://www.wiley.com/WileyCDA/WileyTitle/productCd-0470613033.html)
 
 #### Windows Books
 * [Windows Internals by Mark Russinovich, David Solomon, Alex Ionescu](http://technet.microsoft.com/en-us/sysinternals/bb963901.aspx)
@@ -185,10 +192,14 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
 * [No Tech Hacking by Johnny Long, Jack Wiles, 2008](http://www.elsevier.com/books/no-tech-hacking/mitnick/978-1-59749-215-7)
 * [Social Engineering: The Art of Human Hacking by Christopher Hadnagy, 2010](http://wiley.com/WileyCDA/WileyTitle/productCd-0470639539.html)
 * [Unmasking the Social Engineer: The Human Element of Security by Christopher Hadnagy, 2014](http://wiley.com/WileyCDA/WileyTitle/productCd-1118608577.html)
+* [Social Engineering in IT Security: Tools, Tactics, and Techniques by Sharon Conheady, 2014](http://www.mhprofessional.com/product.php?isbn=0071818464)
 
 #### Lock Picking Books
 * [Practical Lock Picking by Deviant Ollam, 2012](https://www.elsevier.com/books/practical-lock-picking/ollam/978-1-59749-989-7)
 * [Keys to the Kingdom by Deviant Ollam, 2012](https://www.elsevier.com/books/keys-to-the-kingdom/ollam/978-1-59749-983-5)
+* [CIA Lock Picking Field Operative Training Manual](http://www.scribd.com/doc/7207/CIA-Lock-Picking-Field-Operative-Training-Manual)
+* [Lock Picking: Detail Overkill by Solomon](https://www.dropbox.com/s/y39ix9u9qpqffct/Lockpicking%20Detail%20Overkill.pdf?dl=0)
+* [Eddie the Wire books](https://www.dropbox.com/sh/k3z4dm4vyyojp3o/AAAIXQuwMmNuCch_StLPUYm-a?dl=0)
 
 
 ### Vulnerability Databases