Updated the 0.17.0 docs to link over to halite, and clear up that it is not included with salt-master. Created a new halite tutorial that talks about how to set up halite, this is still incomplete for the amount of info I would like in it.
Merge remote branch 'upstream/develop' into develop
initial add of the halite docs, still need a lot of work.
updated hacking (developing) tutorial with information on running a simplye python http server to show changes that you have made.
Stop shipping fonts in the docset. Start using free-fonts from Google and then fall-back to system fonts if those are not available.
Merge remote branch 'upstream/develop' into develop
Reworked part of the halite docs to clarify the running of halite itself, created sections in prep for nginx/apache work.
Use versionadded instead of note
Change assertEquals to assertEqual

According to
http://docs.python.org/2/library/unittest.html#deprecated-aliases
assertEquals is a deprecated alias of assertEqual.
Fix my typo
Merge pull request #8071 from holmboe/deprecated-test-functions

Change assertEquals to assertEqual
Merge pull request #8069 from holmboe/fix-versionadded

Use versionadded instead of note
Merge pull request #8061 from cachedout/free-fonts

Stop shipping fonts in the docset. Start using free-fonts from Google. Fixes #7983
Removing nsProcess plugin. Using ExecWait and a sleep 3s to stop salt-minion.
pip freeze output has comments sometimes: ignore

The output of pip freeze can contain lines like

    ## FIXME: could not find svn URL in dependency_links for this
    package:

These shouldn't log an error about being unable to parse a comment.
Especially since the message pip is trying to deliver to the user will
generally be about the following line, which isn't displayed in salt
output.
Remove stale files in the docs dir. Refs #7984. Tested against a build and walk-through of the HTML docs.
Merge pull request #8076 from AccelerationNet/develop

pip freeze output has comments sometimes: ignore them
Merge pull request #8073 from equinoxefr/update_nsis_installer

Removing nsProcess plugin.
Merge pull request #8077 from cachedout/#7984

Remove stale files in the docs dir. Refs #7984. Tested against a build a...
Merge pull request #8065 from gravyboat/develop

Initial documentation push for halite, updates to 0.17 release notes, updates to hacking guide.