Tell travis we need gcc-multilib
Fix the include paths for new pssdk directory location
Merge branch 'master' of github.com:jlee-r7/meterpreter
Fix CRLF to help smooth conflicts with rapid7/master
Merge branch 'master' into rapid7