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.
Non-minified version of modernizr-2.6.2-respond-1.1.0.min.js. Refs #7748.
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.
Added detection for upstart on Debian/Raspbian distros

Upstart is detected by calling 'initctl version' and checking for 'upstart' in the return string, as is done in /lib/lsb/init-functions
Fix regexes

 - net.py: A MAC address can be separated using periods
 - manage.py: Use regex range
Merge pull request #8044 from holmboe/regexp-changes

Fix regexes
Whitespace and single quotes
Use list.insert
Merge pull request #8045 from holmboe/minor-fixups

Minor fixups
Add enc, comment and options for ssh_auth.absent

These are present for ssh_auth.present, but not for ssh_auth.absent.
This poses a problem further into the code in ssh.check_key (or rather
_refine_enc() in the ssh module) when it is validating the encryption
type.

Fixes #8043.
Argument documentation

And some copyedit.
More copyedit
Add file.blockreplace module and state. With unit tests.
Merge pull request #8046 from holmboe/issue-8043

Add enc, comment and options for ssh_auth.absent
I always have to look up these :)
Merge pull request #8049 from holmboe/hacking-doc

I always have to look up these :)
Run yepnope through JSBeautify to unminify for Debian packaging. Refs #7748.
Merge pull request #8040 from cmartyniuk/develop

Added detection for upstart on Debian/Raspbian distros