Fix unit tests
Unit tests for file state broke after adding the follow_symlnks argument.  Tests were looking for a value in a specific position in a dictionary which has been pushed back one value.  Also fixing an issue that happened if the file being managed by the module is a symlink, file would be treated as a new file.
lint
Moar misc rST fixes
Merge pull request #12781 from garethgreenaway/fix_failing_file_unit_test

Fix for unit tests for file state, fix related to symlinks in file module.
Merge pull request #12783 from whiteinge/moar-rst-fixes

Moar misc rST fixes
Revert "lint"

This reverts commit 9e6329ab9a5e91b73c18a4271e5bc6e4138ccae5.
Merge pull request #12780 from s0undt3ch/develop

Fix unit tests
Merge pull request #12778 from cachedout/formatter_tweak

Clean up highstate formatter
Merge pull request #12752 from eliasp/states_pkg-failed_always_true

Don't return 'True' for failing package installations.
cloud.clouds.nova: rm duplicate import

************* Module salt.cloud.clouds.nova
salt/cloud/clouds/nova.py:113: [W0404(reimported), ] Reimport 'salt.utils.cloud' (imported line 100)
Merge pull request #12784 from cvrebert/patch-1

cloud.clouds.nova: rm duplicate import
Indicate rbenv support in 'gem' module and states
use list comprehension instead of filter() to avoid pylint warning

************* Module salt.pillar.s3
salt/pillar/s3.py:247: [W0640(cell-var-from-loop), _refresh_buckets_cache_file.<lambda>] Cell variable saltenv defined in loop

More details: https://github.com/klen/pylama_pylint/blob/master/pylama_pylint/pylint/checkers/variables.py#L150
Documentation to fix #6300
Fix #12766

@basepi, I need to manually fix this in 2014.1, don't cherrypick
Merge pull request #12786 from hulu/s3-pylint

use list comprehension instead of filter() to avoid pylint warning
Adds support for OrderedDicts in jinja templates.
Changed OrderedDict provider to salt.utils.odict for backwards compat with py2.6
Removes unnecessary collections import.