Commit for merge, some testing updates...
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro
Commit for merge; updating tests..
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro