Merging core into gh-pages

.gitignore

@@ -2,6 +2,8 @@ README.html
 LAYOUT.html
 FAQ.html
 DESIGN.html
+CONTRIBUTING.html
+CONDUCT.html
 *~
 *.pyc
 _site

CONDUCT.md

+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/).

CONTRIBUTING.md

@@ -8,6 +8,8 @@ and reviews of proposed changes are all equally welcome.
 By contributing,
 you are agreeing that Software Carpentry may redistribute your work under
 [these licenses][license].
+You also agree to abide by our
+[contributor code of conduct][conduct].
 
 ## Getting Started
 
@@ -38,9 +40,10 @@ you are agreeing that Software Carpentry may redistribute your work under
     lists the people currently responsible for managing this repository.
     Feel free to contact them if you have any questions or languishing pull requests.
 
+[conduct]: CONDUCT.md
 [lesson-template-issues]: https://github.com/swcarpentry/lesson-template/issues
 [license]: LICENSE.md
-[pro-git]: http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
+[pro-git-chapter]: http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
 [swc-lessons]: http://software-carpentry.org/lessons.html
 [swc-maintainers]: http://software-carpentry.org/lessons.html#maintainers
 [swc-website]: http://software-carpentry.org

Makefile

@@ -4,7 +4,7 @@ DST_RMD = $(patsubst %.Rmd,%.md,$(SRC_RMD))
 
 # All Markdown files (hand-written and generated).
 ALL_MD = $(wildcard *.md) $(DST_RMD)
-EXCLUDE_MD = README.md LAYOUT.md FAQ.md DESIGN.md
+EXCLUDE_MD = README.md LAYOUT.md FAQ.md DESIGN.md CONTRIBUTING.md CONDUCT.md
 SRC_MD = $(filter-out $(EXCLUDE_MD),$(ALL_MD))
 DST_HTML = $(patsubst %.md,%.html,$(SRC_MD))
 

tools/setup-labels

@@ -30,9 +30,9 @@ fi
 OWNER=$1
 REPO=$2
 GITHUB_URL=https://github.com/${OWNER}/${REPO}
-LABELS=(bug defer discussion duplicate enhancement filed-by-newcomer getting-started help-wanted left-as-was suitable-for-newcomer work-in-progress)
-COLORS=(FF0000 66FF00 0000FF 98FB98 E0115F FFFF00 808000 89CFF0 568203 FCE883 545AA7)
-LABELS_TO_DELETE=(help%20wanted invalid question wontfix)
+LABELS=(bug    build  defer  discussion documentation enhancement newcomer-friendly upstream work-in-progress)
+COLORS=(FF0000 551033 66FF00 0000FF     D4318C        E0115F      FCE883            83F52C   545AA7)
+LABELS_TO_DELETE=(duplicate filed-by-newcomer getting-started help%20wanted help-wanted invalid left-as-was suitable-for-newcomer question wontfix)
 
 # Test if repository exists
 curl -s --head ${GITHUB_URL} | head -n 1 | grep -q "HTTP/1.[01] [23].."