Merge branch 'release/1.1.2'

Author: mstrazds1

Diff for: Changelog.md

@@ -1,3 +1,7 @@
+## 1.1.2 (release date: 2017-01-18)
+
+ * Added `vim` and `nano` to install
+
 ## 1.1.1 (release date: 2017-01-17)
 
  * Patched ntpd so that invalid `-s` switch is removed

Diff for: Dockerfile

@@ -10,7 +10,7 @@ CMD ["/sbin/my_init"]
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Nginx-PHP Installation
-RUN apt-get update -y && apt-get install -y wget build-essential python-software-properties git-core
+RUN apt-get update -y && apt-get install -y wget build-essential python-software-properties git-core vim nano
 RUN wget -O - https://download.newrelic.com/548C16BF.gpg | apt-key add - && \
 					echo "deb http://apt.newrelic.com/debian/ newrelic non-free" > /etc/apt/sources.list.d/newrelic.list
 RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 4F4EA0AAE5267A6C