Merge pull request #13734 from lyft/s3-fix-for-headers

Remove extra headers attribute from S3 util
Fixing bug that prevents correct status with upstart
update salt to the final api presented by libnacl in 1.1.0
Add a fix for long lines. Fixes #13724
open files with 'rb'

Windows needs this to be opened with 'rb' to avoid stacktraces.
Catch exceptions when deserializing
Merge pull request #13737 from christabor/syntax-labels

Add a fix for long lines.
Merge pull request #13736 from jessecollier/develop

Fixing bug that prevents correct status with upstart
Adding expect fork to upstart script
Merge pull request #13738 from UtahDave/develop

Open files with 'rb' and catch msgpack deserialization errors
Merge pull request #13735 from lyft/another-fix-for-supervisord

Fix incorrect already running to already started message check for super...
Merge pull request #13713 from terminalmage/issue13672

Allow traversing dicts nested with lists when matching
Merge pull request #13727 from garethgreenaway/host_state_multiple_ips

Adding the ability to manage hosts in /etc/hosts will multiple IP addresses
Move master top file before test
Merge pull request #13728 from ticosax/remove-bbb-code

Since we do not support older versions of docker-py than 0.3.2
Merge pull request #13740 from jessecollier/develop

Adding expect fork to upstart script
Add 2014.1.6 release notes
Merge pull request #13741 from basepi/2014.1.6release

Add 2014.1.6 release notes
Merge pull request #13730 from pass-by-value/test_master_tops

Add regression test for master_tops
Fixes to schedule module and state for error conditions.