Fixes problem with ordering of Salt states.
Adds ignore for all .vagrant dirs and for id_rsa.pub.
Merges Salt state fixes.