diff --git a/builder/parser/dumper/main.go b/builder/parser/dumper/main.go
index aea7ee74cb..33202b7038 100644
--- a/builder/parser/dumper/main.go
+++ b/builder/parser/dumper/main.go
@@ -26,7 +26,7 @@ func main() {
 		if err != nil {
 			panic(err)
 		} else {
-			fmt.Print(ast.Dump())
+			fmt.Println(ast.Dump())
 		}
 	}
 }
diff --git a/builder/parser/testfiles/brimstone-consuldock/result b/builder/parser/testfiles/brimstone-consuldock/result
index b6ef4f817b..927f753514 100644
--- a/builder/parser/testfiles/brimstone-consuldock/result
+++ b/builder/parser/testfiles/brimstone-consuldock/result
@@ -2,4 +2,4 @@
 (maintainer "brimstone@the.narro.ws")
 (env "GOPATH" "/go")
 (entrypoint "/usr/local/bin/consuldock")
-(run "apt-get update && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean && apt-get install -y --no-install-recommends git golang ca-certificates && apt-get clean && rm -rf /var/lib/apt/lists && go get -v github.com/brimstone/consuldock && mv $GOPATH/bin/consuldock /usr/local/bin/consuldock && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty && apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') && rm /tmp/dpkg.* && rm -rf $GOPATH")
\ No newline at end of file
+(run "apt-get update && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean && apt-get install -y --no-install-recommends git golang ca-certificates && apt-get clean && rm -rf /var/lib/apt/lists && go get -v github.com/brimstone/consuldock && mv $GOPATH/bin/consuldock /usr/local/bin/consuldock && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty && apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') && rm /tmp/dpkg.* && rm -rf $GOPATH")
diff --git a/builder/parser/testfiles/brimstone-docker-consul/result b/builder/parser/testfiles/brimstone-docker-consul/result
index e7fee03985..86723dde7f 100644
--- a/builder/parser/testfiles/brimstone-docker-consul/result
+++ b/builder/parser/testfiles/brimstone-docker-consul/result
@@ -6,4 +6,4 @@
 (run "cd /tmp && wget https://dl.bintray.com/mitchellh/consul/0.3.1_web_ui.zip -O web_ui.zip && unzip web_ui.zip && mv dist /webui && rm web_ui.zip")
 (run "apt-get update && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean && apt-get install -y --no-install-recommends unzip wget && apt-get clean && rm -rf /var/lib/apt/lists && cd /tmp && wget https://dl.bintray.com/mitchellh/consul/0.3.1_web_ui.zip -O web_ui.zip && unzip web_ui.zip && mv dist /webui && rm web_ui.zip && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty && apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') && rm /tmp/dpkg.*")
 (env "GOPATH" "/go")
-(run "apt-get update && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean && apt-get install -y --no-install-recommends git golang ca-certificates build-essential && apt-get clean && rm -rf /var/lib/apt/lists && go get -v github.com/hashicorp/consul && mv $GOPATH/bin/consul /usr/bin/consul && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty && apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') && rm /tmp/dpkg.* && rm -rf $GOPATH")
\ No newline at end of file
+(run "apt-get update && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean && apt-get install -y --no-install-recommends git golang ca-certificates build-essential && apt-get clean && rm -rf /var/lib/apt/lists && go get -v github.com/hashicorp/consul && mv $GOPATH/bin/consul /usr/bin/consul && dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty && apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') && rm /tmp/dpkg.* && rm -rf $GOPATH")
diff --git a/builder/parser/testfiles/cpuguy83-nagios/result b/builder/parser/testfiles/cpuguy83-nagios/result
index b95e96b153..a4c637a09e 100644
--- a/builder/parser/testfiles/cpuguy83-nagios/result
+++ b/builder/parser/testfiles/cpuguy83-nagios/result
@@ -37,4 +37,4 @@
 (env "APACHE_LOG_DIR" "/var/log/apache2")
 (expose "80")
 (volume "/opt/nagios/var" "/opt/nagios/etc" "/opt/nagios/libexec" "/var/log/apache2" "/usr/share/snmp/mibs")
-(cmd "/usr/local/bin/start_nagios")
\ No newline at end of file
+(cmd "/usr/local/bin/start_nagios")
diff --git a/builder/parser/testfiles/docker/result b/builder/parser/testfiles/docker/result
index a7960244b3..48a09c12e3 100644
--- a/builder/parser/testfiles/docker/result
+++ b/builder/parser/testfiles/docker/result
@@ -22,4 +22,4 @@
 (workdir "/go/src/github.com/docker/docker")
 (env "DOCKER_BUILDTAGS" "apparmor selinux")
 (entrypoint "hack/dind")
-(copy "." "/go/src/github.com/docker/docker")
\ No newline at end of file
+(copy "." "/go/src/github.com/docker/docker")
diff --git a/builder/parser/testfiles/escapes/result b/builder/parser/testfiles/escapes/result
index 724c399c21..bc763898d5 100644
--- a/builder/parser/testfiles/escapes/result
+++ b/builder/parser/testfiles/escapes/result
@@ -2,4 +2,4 @@
 (maintainer "Erik \\\\Hollensbe <erik@hollensbe.org>\\\"")
 (run "apt-get \\update && apt-get \\\"install znc -y")
 (add "\\conf\\\\\"" "/.znc")
-(cmd "/usr\\\"/bin/znc" "-f" "-r")
\ No newline at end of file
+(cmd "/usr\\\"/bin/znc" "-f" "-r")
diff --git a/builder/parser/testfiles/influxdb/result b/builder/parser/testfiles/influxdb/result
index f0d45a4e27..0998e87e63 100644
--- a/builder/parser/testfiles/influxdb/result
+++ b/builder/parser/testfiles/influxdb/result
@@ -8,4 +8,4 @@
 (expose "8083")
 (expose "8086")
 (expose "8090")
-(expose "8099")
\ No newline at end of file
+(expose "8099")
diff --git a/builder/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result b/builder/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result
index bfd84ae489..afc220c2a7 100644
--- a/builder/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result
+++ b/builder/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result
@@ -1 +1 @@
-(cmd "\"[\\\"echo\\\", \\\"Phew, I just managed to escaped those double quotes\\\"]\"")
\ No newline at end of file
+(cmd "\"[\\\"echo\\\", \\\"Phew, I just managed to escaped those double quotes\\\"]\"")
diff --git a/builder/parser/testfiles/jeztah-invalid-json-json-inside-string/result b/builder/parser/testfiles/jeztah-invalid-json-json-inside-string/result
index f8f7b5017b..484804e2b2 100644
--- a/builder/parser/testfiles/jeztah-invalid-json-json-inside-string/result
+++ b/builder/parser/testfiles/jeztah-invalid-json-json-inside-string/result
@@ -1 +1 @@
-(cmd "'[\"echo\", \"Well, JSON in a string is JSON too?\"]'")
\ No newline at end of file
+(cmd "'[\"echo\", \"Well, JSON in a string is JSON too?\"]'")
diff --git a/builder/parser/testfiles/jeztah-invalid-json-single-quotes/result b/builder/parser/testfiles/jeztah-invalid-json-single-quotes/result
index 0623f8bf45..6147891207 100644
--- a/builder/parser/testfiles/jeztah-invalid-json-single-quotes/result
+++ b/builder/parser/testfiles/jeztah-invalid-json-single-quotes/result
@@ -1 +1 @@
-(cmd "['echo','single quotes are invalid JSON']")
\ No newline at end of file
+(cmd "['echo','single quotes are invalid JSON']")
diff --git a/builder/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result b/builder/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result
index d621ddcff3..1ffbb8ff85 100644
--- a/builder/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result
+++ b/builder/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result
@@ -1 +1 @@
-(cmd "[\"echo\", \"Please, close the brackets when you're done\"")
\ No newline at end of file
+(cmd "[\"echo\", \"Please, close the brackets when you're done\"")
diff --git a/builder/parser/testfiles/jeztah-invalid-json-unterminated-string/result b/builder/parser/testfiles/jeztah-invalid-json-unterminated-string/result
index acedd80c45..32048147b5 100644
--- a/builder/parser/testfiles/jeztah-invalid-json-unterminated-string/result
+++ b/builder/parser/testfiles/jeztah-invalid-json-unterminated-string/result
@@ -1 +1 @@
-(cmd "[\"echo\", \"look ma, no quote!]")
\ No newline at end of file
+(cmd "[\"echo\", \"look ma, no quote!]")
diff --git a/builder/parser/testfiles/kartar-entrypoint-oddities/result b/builder/parser/testfiles/kartar-entrypoint-oddities/result
index 375257a49e..b5ac6fe445 100644
--- a/builder/parser/testfiles/kartar-entrypoint-oddities/result
+++ b/builder/parser/testfiles/kartar-entrypoint-oddities/result
@@ -4,4 +4,4 @@
 (run "apt-get update")
 (run "apt-get -y install redis-server redis-tools")
 (expose "6379")
-(entrypoint "/usr/bin/redis-server")
\ No newline at end of file
+(entrypoint "/usr/bin/redis-server")
diff --git a/builder/parser/testfiles/lk4d4-the-edge-case-generator/result b/builder/parser/testfiles/lk4d4-the-edge-case-generator/result
index 920ed544b5..8a249190e9 100644
--- a/builder/parser/testfiles/lk4d4-the-edge-case-generator/result
+++ b/builder/parser/testfiles/lk4d4-the-edge-case-generator/result
@@ -26,4 +26,4 @@
 (volume "/test3")
 (workdir "/test")
 (add "." "/")
-(copy "." "copy")
\ No newline at end of file
+(copy "." "copy")
diff --git a/builder/parser/testfiles/mail/result b/builder/parser/testfiles/mail/result
index 2d9c30db9c..a0efcf04b6 100644
--- a/builder/parser/testfiles/mail/result
+++ b/builder/parser/testfiles/mail/result
@@ -11,4 +11,4 @@
 (run "mkdir /Mail")
 (run "mkdir /.offlineimap")
 (run "echo \"export TERM=screen-256color\" >/.zshenv")
-(cmd "setsid cron; tmux -2")
\ No newline at end of file
+(cmd "setsid cron; tmux -2")
diff --git a/builder/parser/testfiles/mumble/result b/builder/parser/testfiles/mumble/result
index 123e893dc5..a0036a943e 100644
--- a/builder/parser/testfiles/mumble/result
+++ b/builder/parser/testfiles/mumble/result
@@ -1,4 +1,4 @@
 (from "ubuntu:14.04")
 (run "apt-get update && apt-get install libcap2-bin mumble-server -y")
 (add "./mumble-server.ini" "/etc/mumble-server.ini")
-(cmd "/usr/sbin/murmurd")
\ No newline at end of file
+(cmd "/usr/sbin/murmurd")
diff --git a/builder/parser/testfiles/nginx/result b/builder/parser/testfiles/nginx/result
index 5ac8c77c2f..56ddb6f258 100644
--- a/builder/parser/testfiles/nginx/result
+++ b/builder/parser/testfiles/nginx/result
@@ -8,4 +8,4 @@
 (run "mkdir /www")
 (cmd "/usr/sbin/nginx")
 (volume "/www")
-(expose "80")
\ No newline at end of file
+(expose "80")
diff --git a/builder/parser/testfiles/tf2/result b/builder/parser/testfiles/tf2/result
index 5ec173f67f..d4f94cd8be 100644
--- a/builder/parser/testfiles/tf2/result
+++ b/builder/parser/testfiles/tf2/result
@@ -17,4 +17,4 @@
 (add "./configs" "/steam/tf2/tf/addons/sourcemod/configs")
 (run "mkdir -p /steam/tf2/tf/addons/sourcemod/translations/en")
 (run "cp /steam/tf2/tf/addons/sourcemod/translations/*.txt /steam/tf2/tf/addons/sourcemod/translations/en")
-(cmd "cd /steam/tf2 && ./srcds_run -port 27015 +ip 0.0.0.0 +map ctf_2fort -autoupdate -steam_dir /steam -steamcmd_script /steam/script +tf_bot_quota 12 +tf_bot_quota_mode fill")
\ No newline at end of file
+(cmd "cd /steam/tf2 && ./srcds_run -port 27015 +ip 0.0.0.0 +map ctf_2fort -autoupdate -steam_dir /steam -steamcmd_script /steam/script +tf_bot_quota 12 +tf_bot_quota_mode fill")
diff --git a/builder/parser/testfiles/weechat/result b/builder/parser/testfiles/weechat/result
index b358645cde..c3abb4c54f 100644
--- a/builder/parser/testfiles/weechat/result
+++ b/builder/parser/testfiles/weechat/result
@@ -3,4 +3,4 @@
 (add ".weechat" "/.weechat")
 (add ".tmux.conf" "/")
 (run "echo \"export TERM=screen-256color\" >/.zshenv")
-(cmd "zsh -c weechat")
\ No newline at end of file
+(cmd "zsh -c weechat")
diff --git a/builder/parser/testfiles/znc/result b/builder/parser/testfiles/znc/result
index b4ddf3e653..5493b255fd 100644
--- a/builder/parser/testfiles/znc/result
+++ b/builder/parser/testfiles/znc/result
@@ -2,4 +2,4 @@
 (maintainer "Erik Hollensbe <erik@hollensbe.org>")
 (run "apt-get update && apt-get install znc -y")
 (add "conf" "/.znc")
-(cmd "/usr/bin/znc" "-f" "-r")
\ No newline at end of file
+(cmd "/usr/bin/znc" "-f" "-r")