Merge branch 'master' of https://github.com/evanodell/nomisr

# Conflicts:
#	docs/CONDUCT.html
#	docs/CONTRIBUTING.html
#	docs/LICENSE-text.html
#	docs/LICENSE.html
#	docs/articles/index.html
#	docs/articles/introduction.html
#	docs/authors.html
#	docs/index.html
#	docs/news/index.html
#	docs/reference/index.html
#	docs/reference/nomis_api_key.html
#	docs/reference/nomis_codelist.html
#	docs/reference/nomis_content_type.html
#	docs/reference/nomis_data_info.html
#	docs/reference/nomis_get_data.html
#	docs/reference/nomis_get_metadata.html
#	docs/reference/nomis_overview.html
#	docs/reference/nomis_search.html
#	docs/reference/nomisr.html