Put the travis deploy settings into etc, rather than the separate branch
Merge pull request #7 from justinsb/cleanup_settings_xml

Cleanup settings xml