diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..0c0dae2924
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.sh text eol=lf
+Vagrantfile eol=lf
diff --git a/Vagrantfile b/Vagrantfile
index 3e7ba239ac..3af48ee167 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,135 +1,124 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "ole/jessie64"
-  config.vm.box_version = "0.1.6"
-
-  config.vm.hostname = "planet"
-
-  config.vm.define "planet" do |planet|
-  end
-
-  config.vm.provider "virtualbox" do |vb|
-    vb.name = "planet"
-  end
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8082" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8082
-  config.vm.network "forwarded_port", guest: 5984, host: 2200, auto_correct: true
-  config.vm.network "forwarded_port", guest: 5986, host: 2201, auto_correct: true
-  config.vm.network "forwarded_port", guest: 3000, host: 3000, auto_correct: true
-  config.vm.network "forwarded_port", guest: 9876, host: 9876, auto_correct: true
-  config.vm.network "forwarded_port", guest: 49152, host: 49152, auto_correct: true
-  config.vm.network "forwarded_port", guest: 22, host: 2222, host_ip: "0.0.0.0", id: "ssh", auto_correct: true
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-    vb.memory = "1111"
-  end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  config.vm.provision "shell", inline: <<-SHELL
-#    docker pull portainer/portainer
-#    sudo docker run -d -p 9000:9000 --name treehouse -v /var/run/docker.sock:/var/run/docker.sock portainer:portainer
-
-    # Add CouchDB Docker
-    docker pull klaemo/couchdb
-    sudo docker run -d -p 5984:5984 -p 5986:5986 --name planet -v /srv/data/bell:/usr/local/var/lib/couchdb -v /srv/log/bell:/usr/local/var/log/couchdb klaemo/couchdb
-    # Set up Node.js
-    cd ~
-    curl -sL https://deb.nodesource.com/setup_6.x -o nodesource_setup.sh
-    bash nodesource_setup.sh
-    apt-get -y install nodejs
-    # Install Angular CLI
-    npm install -g @angular/cli
-    # Install Chrome for e2e/Protractor tests
-    wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-    sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-    sudo apt-get update
-    sudo apt-get install -fy google-chrome-stable
-
-    # Add CORS to CouchDB so app has access to databases
-    git clone https://github.com/pouchdb/add-cors-to-couchdb.git
-    cd add-cors-to-couchdb
-    npm install
-    node bin.js http://localhost:5984
-    cd /vagrant
-    # End add CORS to CouchDB
-
-    # node_modules folder breaks when setting up in Windows, so use binding to fix
-    echo "Preparing local node_modules folder…"
-    mkdir -p /vagrant_node_modules
-    mkdir -p /vagrant/node_modules
-    chown vagrant:vagrant /vagrant_node_modules
-    mount --bind /vagrant_node_modules /vagrant/node_modules
-    npm install
-    # End node_modules fix
-
-    # Add initial Couch databases here
-    chmod +x couchdb-setup.sh
-    ./couchdb-setup.sh -p 5984
-    # End Couch database addition
-
-  SHELL
-
-  # Run binding on each startup make sure the mount is available on VM restart
-  config.vm.provision "shell", run: "always", inline: <<-SHELL
-    docker start planet
-    mount --bind /vagrant_node_modules /vagrant/node_modules
-    # Starts the app in a screen (virtual terminal)
-    sudo -u vagrant screen -dmS build bash -c 'cd /vagrant; ng serve'
-  SHELL
-
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "ole/jessie64"
+  config.vm.box_version = "0.2.2"
+
+  config.vm.hostname = "planet"
+
+  config.vm.define "planet" do |planet|
+  end
+
+  config.vm.provider "virtualbox" do |vb|
+    vb.name = "planet"
+  end
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8082" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8082
+  config.vm.network "forwarded_port", guest: 5984, host: 2200, auto_correct: true
+  config.vm.network "forwarded_port", guest: 5986, host: 2201, auto_correct: true
+  config.vm.network "forwarded_port", guest: 3000, host: 3000, auto_correct: true
+  config.vm.network "forwarded_port", guest: 9876, host: 9876, auto_correct: true
+  config.vm.network "forwarded_port", guest: 49152, host: 49152, auto_correct: true
+  config.vm.network "forwarded_port", guest: 22, host: 2222, host_ip: "0.0.0.0", id: "ssh", auto_correct: true
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+    vb.memory = "1111"
+  end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  config.vm.provision "shell", inline: <<-SHELL
+#    docker pull portainer/portainer
+#    sudo docker run -d -p 9000:9000 --name treehouse -v /var/run/docker.sock:/var/run/docker.sock portainer:portainer
+
+    # Add CouchDB Docker
+    sudo docker run -d -p 5984:5984 -p 5986:5986 --name planet -v /srv/data/bell:/usr/local/var/lib/couchdb -v /srv/log/bell:/usr/local/var/log/couchdb klaemo/couchdb:2.0.0
+    # Install Angular CLI
+    sudo npm install -g @angular/cli
+
+    # Add CORS to CouchDB so app has access to databases
+    git clone https://github.com/pouchdb/add-cors-to-couchdb.git
+    cd add-cors-to-couchdb
+    npm install
+    node bin.js http://localhost:5984
+    cd /vagrant
+    # End add CORS to CouchDB
+
+    # node_modules folder breaks when setting up in Windows, so use binding to fix
+    echo "Preparing local node_modules folder…"
+    mkdir -p /vagrant_node_modules
+    mkdir -p /vagrant/node_modules
+    chown vagrant:vagrant /vagrant_node_modules
+    mount --bind /vagrant_node_modules /vagrant/node_modules
+    npm install
+    # End node_modules fix
+
+    # Add initial Couch databases here
+    chmod +x couchdb-setup.sh
+    ./couchdb-setup.sh -p 5984
+    # End Couch database addition
+
+  SHELL
+
+  # Run binding on each startup make sure the mount is available on VM restart
+  config.vm.provision "shell", run: "always", inline: <<-SHELL
+    docker start planet
+    mount --bind /vagrant_node_modules /vagrant/node_modules
+    # Starts the app in a screen (virtual terminal)
+    sudo -u vagrant screen -dmS build bash -c 'cd /vagrant; ng serve'
+  SHELL
+
+end