*Possible* fix for #2318.  Not sure if this will fix @cdeil's specific issue, but it *did* fix the issue for me running on my laptop on the institute network.
Check for and prevent initialization of NDData with Quantity

Closes #2374, though admittedly in an unsatisfactory way.
Add changelog entry
Allow NDData and uncertainty to be set with Quantity
Tweak to remove unnecessary ' in coordinates index
Added missing "the"
Re-wrote frame documentation
Tweaks to consistent-ify the sgr-example with some recent changes
Update changelog, move entry to New Features
Add info about push.default=simple not available in git <1.7.11
Issue INFO-level warning if unit property is changed directly from a non-trivial value

Closes #2411
Changelog entry
Show "# doctest: +SKIP" lines in the output.
Avoid copying the wcslib header files from cextern unnecessarily on each run of setup.py build.  This will only copy them if they are missing/out of date.
Fix two typos in modelling documentation
fix another typo
Merge pull request #2570 from hamogu/patch-1

Fix two typos in modelling documentation
Merge pull request #2551 from mdboom/docs/show-doctest-literals

# doctest: +SKIP  needs to be escaped in documentation examples
Merge pull request #2569 from embray/build/unnecessary-copy

Skip unnecessary copy of wcslib headers on each build.
Disable use of proxy servers by urllib2 entirely when internet is disabled