various style, spacing, spelling fixes to the file state
Merge pull request #7381 from hulu/file-state

various style, spacing, spelling fixes to the file state
Added unit and integration tests for the file.replace functions
Merge pull request #7382 from whiteinge/file-replace-tests

Added unit and integration tests for the file.replace functions
Merge branch 'develop' of github.com:saltstack/salt into develop