Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from Meatballs1/psh_fix

Add guards against empty payloads
Merge pull request #3 from Meatballs1/psh_fix

Really fix war
Merge remote-tracking branch 'origin/master' into exe-template-refactor
Merge branch 'exe-template-refactor' of https://github.com/shellster/metasploit-framework into exe-template-refactor
Greatly shortened to_mem_old.ps1.template by using [Math]::max.
Added necessary end of line conversion in lib/msf/util/exe.rb so
that Powershell will parse multiline strings.
Merge and rescue ex correctly