get-my-ip.py: Remove nesting setup/

There's no need to hard-code target directories in this repository.
Anyone consuming this material can use submodules and pick their own
target directory.
Merge branch 'master' into namespaced

This is a no-op merge, explicitly considering and rejecting the
de-namespacing from the master branch.  After this merge, future
merges from the master branch will pick up any content changes.

  $ git merge --log --no-ff --strategy ours master

* master:
  get-my-ip.py: Remove nesting setup/
swc-windows-installer.py: Remove nesting setup/

There's no need to hard-code target directories in this repository.
Anyone consuming this material can use submodules and pick their own
target directory.
Merge branch 'master' into namespaced

This is a no-op merge, explicitly considering and rejecting the
de-namespacing from the master branch.  After this merge, future
merges from the master branch will pick up any content changes.

  $ git merge --log --no-ff --strategy ours master

* master:
  swc-windows-installer.py: Remove nesting setup/
README.md: Remove nesting setup/

There's no need to hard-code target directories in this repository.
Anyone consuming this material can use submodules and pick their own
target directory.
Merge branch 'master' into namespaced

This is a no-op merge, explicitly considering and rejecting the
de-namespacing from the master branch.  After this merge, future
merges from the master branch will pick up any content changes.

  $ git merge --log --no-ff --strategy ours master

* master:
  README.md: Remove nesting setup/
Merge pull request #113 from wking/readme-remote-addition-typo

README.md: Restore the swcarpentry remote name to 'git remote add'
swc-windows-installer.py: Restore nose entry point

This restores the nose entry point which was removed in 94caead
(swc-windows-installer.py: Remove IPython and nose entry points,
2013-10-21).

On Tue, Oct 22, 2013 at 11:36:21AM -0700, Ethan White wrote:
> IPython works fine for me on Windows 7 for both Anaconda and Canopy
> with no added entry points needed.
>
> Nosetests does not appear to have an entry point on Anaconda and I
> forgot to test it with Canopy.

I used a slightly different bin path than we'd used previously, to
respect 806fedf (swc-windows-installer.py: Rework install paths to use
~/.swc, 2013-10-21).
Merge branch 'master' into bc-namespaced

* master:
  swc-windows-installer.py: Restore nose entry point
Merge branch 'bc-namespaced' of git://tremily.us/swc-setup-get-my-ip into bc-setup

Remove the historyless setup/bin/get-my-ip.py which was added in
01d6419 (Import installation test scripts from boot-camps repo,
2013-09-03), and replacing it with setup/get-my-ip.py and it's
original history from the boot-camps repository.

* 'bc-namespaced' of git://tremily.us/swc-setup-get-my-ip:
  get-my-ip.py: Remove nesting setup/
  get-my-ip.py: Python 2.x sockets can't be used in 'with' statements
  get-my-ip.py: Add a script for getting your public IP address
Merge branch 'bc-namespaced' of git://tremily.us/swc-setup-windows-installer into bc-setup

Remove the historyless setup/bin/swc-windows-installer.py which was
added in 01d6419 (Import installation test scripts from boot-camps
repo, 2013-09-03), and replacing it with
setup/swc-windows-installer.py and it's original history from the
boot-camps repository.

Also remove Ethan's newer setup/bin/swc-nano-installer.py. I've
cherry-picked his commits into an orphan branch in my
windows-installer history, and incorperated his improvements into the
swc-windows-installer.py script.  This means that the
swc-nano-installer.py commits appear twice in this history, once as
thier bc-repo originals, and again in my cherry-picks.  Not the most
elegant solution, but it means that future merges from my
windows-installer branch won't run into any rebased-history problems.

* 'bc-namespaced' of git://tremily.us/swc-setup-windows-installer: (22 commits)
  swc-windows-installer.py: Restore nose entry point
  swc-windows-installer.py: Remove nesting setup/
  swc-nano-installer.py: Remove now that changes are in swc-windows-installer.py
  swc-windows-installer.py: Rework install paths to use ~/.swc
  swc-windows-installer.py: Remove IPython and nose entry points
  swc-windows-installer.py: De-emphasize Anaconda
  swc-windows-installer.py: Rework paths in main()
  swc-windows-installer.py: Generalize update_bash_profile
  swc-windows-installer.py: Bring in Ethan's make_bash_profile and make_posix_path
  Remove testing line
  Append exports to end of .bash_profile instead of overwriting
  Switch from using .bashrc to .bash_profile nano path and editor export
  Add a Nano installer for Windows
  swc-windows-installer.py: Use the stdlib's urlopen()
  swc-windows-installer.py: Use lists for file content
  swc-windows-installer.py: Use `with` to write script wrappers
  swc-windows-installer.py: Simplify `ipython` wrapper
  swc-windows-installer.py: Extract nano directly to the install directory
  swc-windows-installer.py: Avoid writing nano.zip to disk
  swc-windows-installer.py: Separate requests import from stdlib imports
  ...
Merge branch 'bc-namespaced' of git://tremily.us/swc-setup-installation-test into bc-setup

Remove the historyless setup/bin/swc-installation-test-*.py which were
added in 01d6419 (Import installation test scripts from boot-camps
repo, 2013-09-03), and replacing them with the original history from
the boot-camps repository.

This drops the ellipsis -> triple-period changes introduced by 64f4940
(removed stray non-printing unicode characters, 2013-10-11).  In his
comment for swcarpentry/bc#64, Will Trimble says [1]:

> It looks like most of these were present in the old boot-camps
> repository. Because of their positions, I presume these were
> unintended side effects of a format conversion or a cut-and-paste
> gone bad. The unicode characters that are intentional--in strings
> and in names--I have not disturbed. But these are symbols that do
> not seem to be purposeful.

My ellipses were purposeful.  I'd be happy to add `-*- coding: utf-8
-*-` magic comment to the file, but Markdown doesn't have a comment
character...

[1]: https://github.com/swcarpentry/bc/pull/64#issuecomment-26168019

* 'bc-namespaced' of git://tremily.us/swc-setup-installation-test: (70 commits)
  README.md: Remove nesting setup/
  swc-installation-test-2.py: added support for py.test
  swc-installation-test-2.py: Use ProgramFiles environment variable
  swc-installation-test-2.py: Also look for extension-less paths
  swc-installation-test-2.py: Add CommandDependency.paths fallbacks
  swc-installation-test-2.py: Use _ROOT_PATH for MS Windows compatability
  swc-installation-test-2.py: Raise an error on empty version stream
  swc-installation-test-2.py: Don't override Popen's 'close_fds'
  swc-installation-test-2.py: Add 'safari'
  swc-installation-test-2.py: Link directly to install docs
  swc-installation-test-2.py: Add --help and --verbose
  swc-installation-test-2.py: List supported Ubuntu install hints
  swc-installation-test-2.py: Add support for package-specific URLs
  swc-installation-test-1.py: Link to s-c.o's terminal.html
  swc-installation-test-2.py: Add 'argparse'
  swc-installation-test-2.py: Add 'EasyMercurial'
  swc-installation-test-2.py: Initial EditorTaskDependency implementation
  swc-installation-test-2.py: Add PathCommandDependency
  swc-installation-test-2.py: Add TornadoPythonPackage for version extraction
  swc-installation-test-2.py: Add long names for virtual-* packages
  ...
setup/README.md: Add YAML front matter for Jekyll

The bc repository renders content with Jekyll [1], so we need to add
YAML front matter if we want this file to be processed [2].  This
change is unique to the bc-version of this file; it's not in the
upstream installation-test branch.  That shouldn't be a problem
though, because it's unlikely to conflict with further upstream
development.

[1]: See the root README.md in this repository.
[2]: http://jekyllrb.com/docs/frontmatter/

Reported-by: Aron Ahmadia <aron@ahmadia.net>