Review 2142

This pull request tries to help to land https://github.com/rapid7/metasploit-framework/pull/2142

Includes:

* Resolve conflicts making the branch compatible with the indentation changes made int he framework. Read the documentation: https://github.com/rapid7/metasploit-framework/wiki/Indentation-Standards Short summary: the framework has switched to two-space indentation for modules and libs

* Tries to clean up the code at the https://github.com/rapid7/metasploit-framework/pull/2142. Short summary again: I've switched from regular expressions parsing to REXML parsing and have tried to split the parsing code, with the hope of making the code more readable.

Please feel free to review / check /test and land once you feel comfortable with it. On the other hand would be very useful if you add some documentation which helps to understand the XML parsing done in the module, specifically identify every field of data on parse_os_info, parse_process_info, parse_fs_info and parse_net_info.

Thanks!