more work on salt states
Merge branch 'master' of github.com:umeboshi2/paella
updated states, removed squid