added exe-only options to win32pe generation
Avoid merge conflict over Id SVN tag
Retabbed for consistent whitespace
Restore win32pe as the default (not _only)
Merge pull request #1 from todb-r7/exe_only_patch

Exe only patch : avoid merge conflict and don't use win32pe_only everywhere by default.
Fix egypt's typo
Merge pull request #2 from todb-r7/exe_only_patch

Fix egypt's typo
Merge branch 'exe_only_patch' of git://github.com/agix/metasploit-framework