Merge branch 'upstream/master' into ext_server_kiwi
Add post-merge capability to pre-commit-hook.rb

This will make it possible to run a post-merge check when
pre-commit-hook.rb is referenced as a symlink from .git/hooks/post-merge

The kind of check you're going to do is entirely dependant on the
basename of the file, which is a little weird but convenient.

Verification is a little tricky on this. Coming soon.
Remove the broken SPOTCHECK_RECENT stuff
Also remove SPOTCHECK_RECENT from travis.
Add a new .travis.yml
Fix broken spec for Rex::Text.randomize_space
pull JJ's latest changes in for c64

compiler for x86_64 has some bugs, this is JJ's
latest fixes
missed net new files

some net new files we're missing from metasm
Land #3172 - CVE-2014-1510 to firefox_xpi_bootstrapped_addon
Land #3176 because wvu is smarter than me
Custom Service Description
Adapt to new psexec mixin (first try :D)
Fix a bug for backwards compatibility
Erf, sorry, fixed now
Try to fix Meatballs1 suggestions : optional service_description change call
Add DCERPC catch exception
add comments on change description call
Land #2831, add service description to psexec
Add module for CVE-2014-2314
Added new http_header module