Fixing a problem with travis status in the readme rendering

The problem was I had the wrong branch specified.  Hopefully this fixes it
Changed where the settings file came from

Hugo already had a settings file in git in another repository to use as reference.  I now use that version and no longer have a need for settings.xml file
Deleted a blank line to retrigger the build
Minor formatting change of the travis build file
Trying to get the build working again
Merge branch '0.7.x' into 0.7.x-smartos

Conflicts:
	README.md