Merge branch 'development' into kory-curvening

Dockerfile

@@ -9,10 +9,10 @@ RUN set -e && \
     cp /usr/local/sassc-$SASS_VERSION/bin/sassc /usr/local/bin/sassc && \
     rm -rf /usr/local/sassc-$SASS_VERSION /usr/local/libsass-$SASS_VERSION
 
-RUN mkdir -p /go/src/github.com/UniversityRadioYork/2016-site
-WORKDIR /go/src/github.com/UniversityRadioYork/2016-site
+RUN mkdir -p /go/src/github.com/UniversityRadioYork/201623-site
+WORKDIR /go/src/github.com/UniversityRadioYork/201623-site
 
-COPY . /go/src/github.com/UniversityRadioYork/2016-site
+COPY . /go/src/github.com/UniversityRadioYork/201623-site
 
 EXPOSE 3000
 

Makefile

@@ -20,10 +20,10 @@ build-sass: $(SASS_SRC)
 	$(SASS_COMPILER) $(MAIN_FILE) $(OUTPUT_FILE) -t compressed
 
 build-docker-image:
-	docker build -t 2016-site .
+	docker build -t 201623-site .
 
 docker:
-	docker run -it --rm -p 3000:3000 -v $$GOPATH/src/github.com/UniversityRadioYork/2016-site:/go/src/github.com/UniversityRadioYork/2016-site 2016-site
+	docker run -it --rm -p 3000:3000 -v $$GOPATH/src/github.com/UniversityRadioYork/201623-site:/go/src/github.com/UniversityRadioYork/201623-site 201623-site
 
 clean:
 	rm -f $(OUTPUT_FILE) $(BINARY)

README.md

@@ -1,4 +1,4 @@
-# 2016-site #
+# 201623-site #
 
 ## How to install ##
 Full instructions for installation are available in the USING.md file.

USING.md

@@ -38,9 +38,9 @@ export GOPATH=~/go
 
 #### Pulling from git
 * Make sure GOPATH is set (`echo $GOPATH`)
-* `go get github.com/UniversityRadioYork/2016-site`
-    * This downloads 2016-site to ~/go/src/github.com/UniversityRadioYork/2016-site along with all necessary dependencies
-* To update your working copy of the repo, running `go get` in the 2016-site directory, but you can also checkout to a specific branch if required:
+* `go get github.com/UniversityRadioYork/201623-site`
+    * This downloads 201623-site to ~/go/src/github.com/UniversityRadioYork/201623-site along with all necessary dependencies
+* To update your working copy of the repo, running `go get` in the 201623-site directory, but you can also checkout to a specific branch if required:
     * `git checkout this-is-a-branch-name`
 
 #### Running the server =====
@@ -51,7 +51,7 @@ export GOPATH=~/go
 
 ### Editing files
 #### Ubuntu
-Trivial. Open a file editor and browse to ~/go/src/github.com/UniversityRadioYork/2016-site
+Trivial. Open a file editor and browse to ~/go/src/github.com/UniversityRadioYork/201623-site
 
 #### Windows
 * Windows likes to hide the actual files for the Ubuntu subsystem.