diff --git a/.travis.sh b/.travis.sh
index bd274e59f..d3a2b97f3 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -29,15 +29,13 @@ if [ $RUNTESTS ] ; then
 elif [ $PUBLISHDOCS ] ; then
 	if [ $PUBLISH_URL ] ; then
 
-		sudo apt-get install zlib1g-dev libssl-dev wkhtmltopdf libxml2-dev libxslt-dev #ruby-rvm
-
 		# Patch Gimli to fix underscores_inside_words
 		curl -L "${CURL_BASEOPTS[@]}" https://github.com/walle/gimli/archive/v0.5.9.tar.gz | tar zxf -
 
 		sed -i 's/).render(/, :no_intra_emphasis => true).render(/' gimli-0.5.9/ext/github_markup.rb
 
 		cd gimli-0.5.9/
-		gem build gimli.gemspec && rvmsudo gem install gimli
+		gem build gimli.gemspec && gem install gimli
 		cd ../
 
 		./build_docs.sh
diff --git a/.travis.yml b/.travis.yml
index e87a32ccf..41bdfec80 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,29 @@ env:
   - TARGET=ALIENWIIF1
   - TARGET=ALIENWIIF3
 
+# use new docker environment
+sudo: false
+
+addons:
+  apt:
+    packages:
+      - build-essential
+      - git
+      - libc6-i386
+      - zlib1g-dev
+      - libssl-dev
+      - wkhtmltopdf
+      - libxml2-dev
+      - libxslt-dev
+
 # We use cpp for unit tests, and c for the main project.
 language: cpp
 compiler: clang
 
 before_install:
-  - sudo apt-get update
   - curl --retry 10 --retry-max-time 120 -L "https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q2-update/+download/gcc-arm-none-eabi-4_9-2015q2-20150609-linux.tar.bz2" | tar xfj -
 
 install:
-  - sudo apt-get install build-essential git libc6-i386
   - export PATH=$PATH:$PWD/gcc-arm-none-eabi-4_9-2015q2/bin
 
 before_script: arm-none-eabi-gcc --version
diff --git a/build_docs.sh b/build_docs.sh
index 9f457fbe7..8dc8fbffa 100755
--- a/build_docs.sh
+++ b/build_docs.sh
@@ -3,7 +3,7 @@
 filename=Manual
 doc_files=(
 	'Introduction.md'
-    'Getting Started.md'
+  'Getting Started.md'
 	'Safety.md'
 	'Installation.md'
 	'Configuration.md'
@@ -41,7 +41,7 @@ if which gimli >/dev/null; then
 	echo "Building ${filename}.pdf"
 	pushd . >/dev/null
 	cd docs
-	
+
 	rm -f ${filename}.md
 	for i in "${doc_files[@]}"
 	do
@@ -49,7 +49,7 @@ if which gimli >/dev/null; then
 	done
 	rm -f ${filename}.pdf
 	gimli -f ${filename}.md -stylesheet override.css
-	rm ${filename}.md 
+	rm ${filename}.md
 	popd >/dev/null
 else
 	echo -e "\nFAILED"
@@ -57,7 +57,3 @@ else
 	echo -e "https://github.com/walle/gimli\n"
 	exit 1
 fi
-
-
-
-