Use salt.utils.fopen instead of open
Merge pull request #4208 from basepi/fileregex

Rename file.contains_regex to file.contains_regex_multiline.
update rpm spec to patch release 0.13.3
Check for exists() rather than isfile(), and remove dest if force
Make new link in case of links, otherwise move
Use lexists instead of exists (includes broken symbolic links)
Unlink source after creating new link
Merge pull request #4209 from UtahDave/fix_file.recurse

Fix file.recurse on Windows
Merge pull request #4207 from corywright/recurse_dirs_docs

add a mention of the include_empty option to file.recurse
Add doc update to source docs per #4207
Merge pull request #4214 from basepi/renamefix4079

Fix file.rename so it works with files, dirs, and links
Merge pull request #4215 from herlo/develop

update rpm spec to patch release 0.13.3
Fix wheel token auth by moving eauth checks below token
Fix multiplication problem for #3431

The pyzmq bindings already do the conversion to milliseconds (https://github.com/zeromq/pyzmq/blob/master/zmq/eventloop/ioloop.py) So instead of sleeping 60 seconds, we are sleeping 60000 seconds (~16 hours) which is causing the cli to "never return"

In addition we aren't passing the timeout of the command from the client down tot the zmq socket
naught-dot-fourteen bump
Merge pull request #4218 from jacksontj/develop

Fix multiplication problem for #3431
Merge pull request #4217 from whiteinge/fix-token-auth

Fix wheel token auth by moving eauth checks below token
Revert multiplication until full trace can happen
Clean out payload connection timeout, this is not passed down from here
Revert timing change #3431

The docs are aweful confusing, but it does look like this needs to be converted