Not sure what this is.... commit for merge
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro
Think i updated some white space o.O
Updating merge conflict