Updated xctool to clean up and merge output XML.

Addressing issue: https://github.com/facebook/xctool/issues/141
xctool, upon supplying different testsuite objects with the same name,
would separate the testsuites. This diff should merge the xml objects
that should not be logically separated.

Also, Xcode re-indented some files as my vimrc had different settings. These files are indented using Xcode's default indenting scheme.