Refactoring states.
Merge branch 'master' of github.com:dstegelman/salty-django