Merge pull request #63 from zachriggle/freebsd-ssh-cache

FreeBSD hash utility is called shasum
Merge pull request #56 from zachriggle/elf-disasm-vma

Add --vma-offset to asm.disasm() and ELF.disasm() helper to automate
Merge branch 'less-silent-ssh' of https://github.com/zachriggle/pwntools into zachriggle-less-silent-ssh
The log_level argument was not needed here
Merge branch 'zachriggle-less-silent-ssh'
Merge branch 'ssh-channel-with-statement' of https://github.com/zachriggle/pwntools into zachriggle-ssh-channel-with-statement
Fixed the placement of the __enter__ and __exit__ functions in pwnlib/tubes/tube.py
Merge branch 'zachriggle-ssh-channel-with-statement'
Merge pull request #58 from zachriggle/ssh-easy-bad-attrs

Filter a few things which should not spawn SSH commands
Merge pull request #61 from zachriggle/elf-dso-address-fix

Bugfix: ELF load address for DSO is 0, libc addresses now correct
Merge branch 'v2-rop' of https://github.com/zachriggle/pwntools into zachriggle-v2-rop
Fixed up the rop commit a bit
Merge branch 'zachriggle-v2-rop'
Merge branch 'master' of github.com:Gallopsled/pwntools

Conflicts:
	pwnlib/elf.py
fixed #60 -- this would not (could not) have happened in a statically typed language
Merge branch 'elf-dont-load-dyn-dependencies' of https://github.com/zachriggle/pwntools into zachriggle-elf-dont-load-dyn-dependencies
Replaced a generic "except:" in elf.py with a catching a specific exception
Merge branch 'zachriggle-elf-dont-load-dyn-dependencies'
added script to generate examples/README.md and the new README.md
updated example docstrings and README.md