diff --git a/.gitignore b/.gitignore
index 5a7d5419a1e..b61a4a34a55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@ dump.rdb
 /cache
 /coverage/*
 
+config/database.yml
+config/redis.yml
+
 # Ignore the default SQLite database and db dumps
 /db/*.sqlite3
 /dbs/*.sql
@@ -59,3 +62,6 @@ config/fog_credentials.yml
 # Scripts used for downloading/refshing db
 script/download_db
 script/refresh_db
+
+# temp directory for chef (used to configure vagrant VM)
+chef/tmp/*
diff --git a/.travis.yml b/.travis.yml
index bb1d6fec500..bb5d35d9498 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: ruby
 rvm:
   - 1.9.3
 before_script:
+  - cp config/database.yml.sample config/database.yml
+  - cp config/redis.yml.sample config/redis.yml
   - psql -c 'create database discourse_test;' -U postgres
   - rake db:migrate
 script: 'rake spec && bundle exec guard-jasmine --server-timeout=60'
diff --git a/DEVELOPER-ADVANCED.md b/DEVELOPER-ADVANCED.md
new file mode 100644
index 00000000000..89cc2594109
--- /dev/null
+++ b/DEVELOPER-ADVANCED.md
@@ -0,0 +1,128 @@
+# Discourse Advanced Developer Install Guide
+
+This guide is aimed at advanced Rails developers who have installed their own Rails apps before. If you are new
+to rails, you are likely much better off with our **[Discourse Vagrant Developer Guide](https://github.com/discourse/discourse/blob/master/VAGRANT.md)**.
+
+## First Steps
+
+1. Install and configure PostgreSQL 9.1+
+2. Install and configure Redis 2+
+3. Install Rails 1.9.3 and Bundler.
+3. Clone the project.
+4. Create development and test databases in postgres.
+5. Copy `config/database.yml.sample' and `config/redis.yml.sample` to `config/database.yml` and `config/redis.yml.sample` and input the correct values to point to your postgres and redis instances.
+6. We recommend starting with seed data to play around in your development environment. [Download Seed SQL Data](http://discourse.org/vms/dev-discourse-seed.sql). Install it into postgres using a command like this: `psql -d discourse_development < dev-discourse-seed.sql`.
+
+
+## Before you start Rails
+
+1. `bundle install`
+2. `rake db:migrate`
+3. `rake db:test:prepare`
+4. Try running the specs: `bundle exec rspec`
+5. `bundle exec rails server`
+
+You should now be able to connect to rails on http://localhost:3000 - try it out! The seed data includes a pinned topic that explains how to get an admin account, so start there! Happy hacking!
+
+
+# Building your own Vagrant VM
+
+Here are the steps we used to create the **[Vagrant Virtual Machine](https://github.com/discourse/discourse/blob/master/VAGRANT.md)**. They might be useful if you plan on setting up an environment from scratch on Linux:
+
+
+## Base box
+
+Vagrant version 1.0.5. With this Vagrantfile:
+
+    Vagrant::Config.run do |config|
+      config.vm.box     = 'precise32'
+      config.vm.box_url = 'http://files.vagrantup.com/precise32.box'
+      config.vm.network :hostonly, '192.168.10.200'
+    
+      if RUBY_PLATFORM =~ /darwin/
+        config.vm.share_folder("v-root", "/vagrant", ".", :nfs => true)
+      end
+    end
+
+    vagrant up
+    vagrant ssh
+
+## Some basic setup:
+
+    sudo su -
+    ln -sf /usr/share/zoneinfo/Canada/Eastern /etc/localtime
+    apt-get -yqq update
+    apt-get -yqq install python-software-properties
+    apt-get -yqq install vim curl expect debconf-utils git-core build-essential zlib1g-dev libssl-dev openssl libcurl4-openssl-dev libreadline6-dev libpcre3 libpcre3-dev
+
+## Unicode
+
+    echo "export LANGUAGE=en_US.UTF-8" >> /etc/bash.bashrc
+    echo "export LANG=en_US.UTF-8" >> /etc/bash.bashrc
+    echo "export LC_ALL=en_US.UTF-8" >> /etc/bash.bashrc
+    export LANGUAGE=en_US.UTF-8
+    export LANG=en_US.UTF-8
+    export LC_ALL=en_US.UTF-8
+    
+    locale-gen en_US.UTF-8
+    dpkg-reconfigure locales
+
+## RVM and Ruby
+
+    apt-get -yqq install libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison subversion pkg-config curl build-essential git
+    
+    su - vagrant -c "sudo bash -s stable < <(curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer)"
+    adduser vagrant rvm
+    source /etc/profile.d/rvm.sh
+    su - vagrant -c "rvm pkg install libyaml"
+    su - vagrant -c "rvm install 1.9.3-p374"
+    su - vagrant -c "rvm use 1.9.3-p374 --default"
+    
+    echo "gem: --no-rdoc --no-ri" >> /etc/gemrc
+    su - vagrant -c "echo 'gem: --no-rdoc --no-ri' >> ~/.gemrc"
+
+## Postgres 9.1
+
+Configure so that the vagrant user doesn't need to provide username and password.
+
+    apt-get -yqq install postgresql postgresql-contrib-9.1 libpq-dev postgresql-server-dev-9.1
+    su - postgres
+    psql -c "CREATE USER vagrant WITH PASSWORD 'password';"
+    psql -c "ALTER USER vagrant WITH PASSWORD 'password';"
+    createdb vagrant
+    psql -c "CREATE EXTENSION hstore;"
+    psql -c "ALTER USER vagrant CREATEDB"
+    psql -c "create database discourse_development owner vagrant encoding 'UTF8' TEMPLATE template0;"
+    psql -c "create database discourse_test        owner vagrant encoding 'UTF8' TEMPLATE template0;"
+
+Also, a user "discourse" is needed when importing a database image.
+
+    createuser --createdb --superuser discourse
+    psql -c "ALTER USER discourse WITH PASSWORD 'password';"
+
+Edit /etc/postgresql/9.1/main/pg_hba.conf to have this:
+
+    local all all trust 
+    host all all 127.0.0.1/32 trust
+    host all all ::1/128 trust
+    host all all 0.0.0.0/0 trust # wide-open
+
+Download a database image from [http://discourse.org/vms/dev-discourse-seed.sql][1]
+
+Load it (as vagrant user):
+
+    psql -d discourse_development < dev-discourse-seed.sql
+
+## Redis
+
+    mkdir /tmp/redis_install
+    cd /tmp/redis_install
+    wget http://redis.googlecode.com/files/redis-2.6.7.tar.gz
+    tar xvf redis-2.6.7.tar.gz
+    cd redis-2.6.7
+    make
+    make install
+    cd utils
+    ./install_server.sh
+    # Press enter to accept all the defaults
+    /etc/init.d/redis_6379 start
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index be92a1d594a..2a23a5704db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -90,5 +90,7 @@ end
 group :development do 
   gem 'better_errors'
   gem 'binding_of_caller' # I tried adding this and got an occational crash
-  gem 'pry-rails'
-end
\ No newline at end of file
+  gem 'librarian', '>= 0.0.25', require: false
+  gem 'pry-rails'  
+end
+
diff --git a/Gemfile.lock b/Gemfile.lock
index 513b7daea8b..e545bfd986d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,6 +98,7 @@ GEM
     airbrake (3.1.2)
       activesupport
       builder
+    archive-tar-minitar (0.5.2)
     arel (3.0.2)
     barber (0.2.0)
       execjs
@@ -112,6 +113,20 @@ GEM
       facter (>= 1.6.12)
       timers (>= 1.0.0)
     certified (0.1.1)
+    chef (11.2.0)
+      erubis
+      highline (>= 1.6.9)
+      json (~> 1.7.6, >= 1.4.4)
+      mixlib-authentication (>= 1.3.0)
+      mixlib-cli (~> 1.3.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.3.0)
+      mixlib-shellout
+      net-ssh (~> 2.6)
+      net-ssh-multi (~> 1.1.0)
+      ohai (>= 0.6.0)
+      rest-client (>= 1.0.4, < 1.7.0)
+      yajl-ruby (~> 1.1)
     childprocess (0.3.7)
       ffi (~> 1.0, >= 1.0.6)
     clockwork (0.4.1)
@@ -174,6 +189,7 @@ GEM
     haml (3.1.7)
     has_ip_address (0.0.1)
     hashie (1.2.0)
+    highline (1.6.15)
     hike (1.2.1)
     hiredis (0.4.5)
     hpricot (0.8.6)
@@ -188,6 +204,7 @@ GEM
       progress (~> 2.4.0)
     image_size (1.1.1)
     in_threads (1.1.1)
+    ipaddress (0.8.0)
     jasminerice (0.0.10)
       coffee-rails
       haml
@@ -198,6 +215,11 @@ GEM
     json (1.7.7)
     jwt (0.1.5)
       multi_json (>= 1.0)
+    librarian (0.0.26)
+      archive-tar-minitar (>= 0.5.2)
+      chef (>= 0.10)
+      highline
+      thor (~> 0.15)
     libv8 (3.11.8.13)
     listen (0.7.2)
     lumberjack (1.0.2)
@@ -208,6 +230,12 @@ GEM
     metaclass (0.0.1)
     method_source (0.8.1)
     mime-types (1.21)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-cli (1.3.0)
+    mixlib-config (1.1.2)
+    mixlib-log (1.4.1)
+    mixlib-shellout (1.1.0)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.5.1)
@@ -216,6 +244,11 @@ GEM
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.6.3)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    net-ssh-multi (1.1)
+      net-ssh (>= 2.1.4)
+      net-ssh-gateway (>= 0.99.0)
     nokogiri (1.5.6)
     oauth (0.4.7)
     oauth2 (0.8.0)
@@ -224,6 +257,14 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
+    ohai (6.16.0)
+      ipaddress
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      mixlib-shellout
+      systemu
+      yajl-ruby
     oj (2.0.3)
     omniauth (1.1.1)
       hashie (~> 1.2)
@@ -356,8 +397,8 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    slim (1.3.0)
-      temple (~> 0.4.1)
+    slim (1.3.6)
+      temple (~> 0.5.5)
       tilt (~> 1.3.3)
     slop (3.4.3)
     spork (0.9.2)
@@ -366,7 +407,8 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    temple (0.4.1)
+    systemu (2.5.2)
+    temple (0.5.5)
     terminal-notifier-guard (1.5.3)
     terminal-table (1.4.5)
     therubyracer (0.11.3)
@@ -389,6 +431,7 @@ GEM
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
@@ -423,6 +466,7 @@ DEPENDENCIES
   image_optim
   jasminerice
   jquery-rails
+  librarian (>= 0.0.25)
   message_bus!
   mocha
   multi_json
diff --git a/README.md b/README.md
index ddd2f6d49cb..404dbc94398 100644
--- a/README.md
+++ b/README.md
@@ -13,26 +13,15 @@ Whenever you need ...
 
 ## Getting Started
 
-If you're interested in helping us develop Discourse, please start with our **[Discourse Developer Install Guide](https://github.com/discourse/discourse/blob/master/DEVELOPMENT.md)**, which includes instructions to get up and running in a development environment.
+If you're interested in helping us develop Discourse, please start with our **[Discourse Vagrant Developer Guide](https://github.com/discourse/discourse/blob/master/VAGRANT.md)**, which includes instructions to get up and running in a development environment using a virtual machine. It's the easiest way to hack on Discourse.
+
+If you're familiar with how Rails works and are comfortable setting up your own environemnt, you can use our **[Discourse Advanced Developer Guide](https://github.com/discourse/discourse/blob/master/DEVELOPER-ADVANCED.md)**
 
 ### Requirements
 
 * PostgreSQL 9.1+
 * Redis 2+
 
-### The quick and easy setup
-
-```
-git clone git@github.com:discourse/discourse.git
-cd discourse
-bundle install
-rake db:create
-rake db:migrate
-rake db:seed_fu
-redis-cli flushall
-thin start
-```
-
 ## Vision
 
 This is the **Civilized Discourse Construction Kit**, a fully open-source package of forum software that is free to use and contribute to. Discourse embraces the changes that are necessary to evolve forum software, namely:
@@ -64,6 +53,7 @@ This vision translates to the following functional commitments:
 ## Contributing
 
 [![Build Status](https://travis-ci.org/discourse/discourse.png)](https://travis-ci.org/discourse/discourse)
+[![Code Climate](https://codeclimate.com/github/discourse/discourse.png)](https://codeclimate.com/github/discourse/discourse)
 
 Discourse is **100% free** and **open-source**. We encourage and support an active, healthy community that
 accepts contributions from the public, and we'd like you to be a part of that community.
diff --git a/DEVELOPMENT.md b/VAGRANT.md
similarity index 84%
rename from DEVELOPMENT.md
rename to VAGRANT.md
index 5f71482907f..5addb73ef17 100644
--- a/DEVELOPMENT.md
+++ b/VAGRANT.md
@@ -1,6 +1,8 @@
-# Discourse Developer Install Guide
+# Discourse Developer Install Guide (Vagrant)
 
 If you'd like to set up a development environment for Discourse, the easiest way is by using a virtual machine.
+If you have experience setting up Rails projects, you might want to take a look at our **[Discourse Advanced Developer Guide](https://github.com/discourse/discourse/blob/master/DEVELOPER-ADVANCED.md)**.
+It also contains instructions on building your own Vagrant VM.
 
 The following instructions will automatically download and provision a virtual machine for you to begin hacking
 on Discourse with:
@@ -49,7 +51,7 @@ Once your VM is up to date, you can start a rails instance using the following c
 bundle exec rails server
 ```
 
-In a few seconds, rails will start server pages. To access them, open a web browser to http://localhost:4000 - if it all worked you should see discourse! Congratulations, you are ready to start working!
+In a few seconds, rails will start serving pages. To access them, open a web browser to http://localhost:4000 - if it all worked you should see discourse! Congratulations, you are ready to start working!
 
 You can now edit files on your local file system, using your favorite text editor or IDE. When you reload your web browser, it should have the latest changes.
 
diff --git a/Vagrantfile b/Vagrantfile
index 870554d2890..ab165e419b3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -27,4 +27,27 @@ Vagrant::Config.run do |config|
 
   nfs_setting = RUBY_PLATFORM =~ /darwin/ ? true : false
   config.vm.share_folder("v-root", "/vagrant", ".", :nfs => nfs_setting)
+
+  chef_cookbooks_path = ["chef/cookbooks"]
+
+  # The first chef run just upgrades the chef installation using omnibus
+  config.vm.provision :chef_solo do |chef|
+    chef.binary_env = "GEM_HOME=/opt/vagrant_ruby/lib/ruby/gems/1.8/ GEM_PATH= "
+    chef.binary_path = "/opt/vagrant_ruby/bin/"
+    chef.cookbooks_path = chef_cookbooks_path
+    chef.add_recipe "recipe[omnibus_updater]"
+    chef.add_recipe "discourse"
+    chef.json = { :omnibus_updater => { 'version_search' => false }}
+  end
+
+  # The second chef run uses the updated chef-solo and does normal configuration
+  config.vm.provision :chef_solo do |chef|
+    chef.binary_env = "GEM_HOME=/opt/chef/embedded/lib/ruby/gems/1.9.1/ GEM_PATH= "
+    chef.binary_path = "/opt/chef/bin/"
+    chef.cookbooks_path = chef_cookbooks_path
+    chef.add_recipe "recipe[apt]"
+    chef.add_recipe "recipe[build-essential]"
+    chef.add_recipe "recipe[phantomjs]"
+    chef.add_recipe "recipe[vim]"    
+  end
 end
diff --git a/app/assets/images/auth/facebook.gif b/app/assets/images/auth/facebook.gif
deleted file mode 100644
index b997b358f78..00000000000
Binary files a/app/assets/images/auth/facebook.gif and /dev/null differ
diff --git a/app/assets/images/auth/google.gif b/app/assets/images/auth/google.gif
deleted file mode 100644
index 1b6cd07bd8b..00000000000
Binary files a/app/assets/images/auth/google.gif and /dev/null differ
diff --git a/app/assets/images/auth/twitter.png b/app/assets/images/auth/twitter.png
deleted file mode 100644
index 16dfa69477f..00000000000
Binary files a/app/assets/images/auth/twitter.png and /dev/null differ
diff --git a/app/assets/images/auth/yahoo.gif b/app/assets/images/auth/yahoo.gif
deleted file mode 100644
index 42adbfa57f8..00000000000
Binary files a/app/assets/images/auth/yahoo.gif and /dev/null differ
diff --git a/app/assets/images/avatars/0.jpg b/app/assets/images/avatars/0.jpg
deleted file mode 100644
index 333bc6f6e33..00000000000
Binary files a/app/assets/images/avatars/0.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/1.jpg b/app/assets/images/avatars/1.jpg
deleted file mode 100644
index baefa551c71..00000000000
Binary files a/app/assets/images/avatars/1.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/10.jpg b/app/assets/images/avatars/10.jpg
deleted file mode 100644
index c8f45dcd431..00000000000
Binary files a/app/assets/images/avatars/10.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/100.jpg b/app/assets/images/avatars/100.jpg
deleted file mode 100644
index d799cd2acd4..00000000000
Binary files a/app/assets/images/avatars/100.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/101.jpg b/app/assets/images/avatars/101.jpg
deleted file mode 100644
index de9910f0840..00000000000
Binary files a/app/assets/images/avatars/101.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/102.jpg b/app/assets/images/avatars/102.jpg
deleted file mode 100644
index 7088c12b6dd..00000000000
Binary files a/app/assets/images/avatars/102.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/103.jpg b/app/assets/images/avatars/103.jpg
deleted file mode 100644
index 277d481f477..00000000000
Binary files a/app/assets/images/avatars/103.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/104.jpg b/app/assets/images/avatars/104.jpg
deleted file mode 100644
index 787c4ab792c..00000000000
Binary files a/app/assets/images/avatars/104.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/105.jpg b/app/assets/images/avatars/105.jpg
deleted file mode 100644
index c1f90418ea8..00000000000
Binary files a/app/assets/images/avatars/105.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/106.jpg b/app/assets/images/avatars/106.jpg
deleted file mode 100644
index 04782209da6..00000000000
Binary files a/app/assets/images/avatars/106.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/107.jpg b/app/assets/images/avatars/107.jpg
deleted file mode 100644
index ff5bfd7a278..00000000000
Binary files a/app/assets/images/avatars/107.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/108.jpg b/app/assets/images/avatars/108.jpg
deleted file mode 100644
index 7011b72fcb0..00000000000
Binary files a/app/assets/images/avatars/108.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/109.jpg b/app/assets/images/avatars/109.jpg
deleted file mode 100644
index 7a8c43d983a..00000000000
Binary files a/app/assets/images/avatars/109.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/11.jpg b/app/assets/images/avatars/11.jpg
deleted file mode 100644
index 4b89d1c71a5..00000000000
Binary files a/app/assets/images/avatars/11.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/110.jpg b/app/assets/images/avatars/110.jpg
deleted file mode 100644
index ff378683179..00000000000
Binary files a/app/assets/images/avatars/110.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/111.jpg b/app/assets/images/avatars/111.jpg
deleted file mode 100644
index 78efc513dff..00000000000
Binary files a/app/assets/images/avatars/111.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/112.jpg b/app/assets/images/avatars/112.jpg
deleted file mode 100644
index c6f30e6d8bc..00000000000
Binary files a/app/assets/images/avatars/112.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/113.jpg b/app/assets/images/avatars/113.jpg
deleted file mode 100644
index 65bfa5f2d1d..00000000000
Binary files a/app/assets/images/avatars/113.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/114.jpg b/app/assets/images/avatars/114.jpg
deleted file mode 100644
index 00889de5393..00000000000
Binary files a/app/assets/images/avatars/114.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/115.jpg b/app/assets/images/avatars/115.jpg
deleted file mode 100644
index dc60ebcebbd..00000000000
Binary files a/app/assets/images/avatars/115.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/116.jpg b/app/assets/images/avatars/116.jpg
deleted file mode 100644
index 1d424b10f7c..00000000000
Binary files a/app/assets/images/avatars/116.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/117.jpg b/app/assets/images/avatars/117.jpg
deleted file mode 100644
index 898ff6f54d0..00000000000
Binary files a/app/assets/images/avatars/117.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/118.jpg b/app/assets/images/avatars/118.jpg
deleted file mode 100644
index c61aa71322a..00000000000
Binary files a/app/assets/images/avatars/118.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/119.jpg b/app/assets/images/avatars/119.jpg
deleted file mode 100644
index 8b6e7b0397f..00000000000
Binary files a/app/assets/images/avatars/119.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/12.jpg b/app/assets/images/avatars/12.jpg
deleted file mode 100644
index 46daa73ae4c..00000000000
Binary files a/app/assets/images/avatars/12.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/120.jpg b/app/assets/images/avatars/120.jpg
deleted file mode 100644
index f4476eb4048..00000000000
Binary files a/app/assets/images/avatars/120.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/121.jpg b/app/assets/images/avatars/121.jpg
deleted file mode 100644
index 5df73cf42e3..00000000000
Binary files a/app/assets/images/avatars/121.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/122.jpg b/app/assets/images/avatars/122.jpg
deleted file mode 100644
index 87a1ca759b3..00000000000
Binary files a/app/assets/images/avatars/122.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/123.jpg b/app/assets/images/avatars/123.jpg
deleted file mode 100644
index 21918bab528..00000000000
Binary files a/app/assets/images/avatars/123.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/124.jpg b/app/assets/images/avatars/124.jpg
deleted file mode 100644
index ae3eb5765d1..00000000000
Binary files a/app/assets/images/avatars/124.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/125.jpg b/app/assets/images/avatars/125.jpg
deleted file mode 100644
index 3b8e3e97eeb..00000000000
Binary files a/app/assets/images/avatars/125.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/126.jpg b/app/assets/images/avatars/126.jpg
deleted file mode 100644
index ce7d29b2125..00000000000
Binary files a/app/assets/images/avatars/126.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/127.jpg b/app/assets/images/avatars/127.jpg
deleted file mode 100644
index ddd555874ee..00000000000
Binary files a/app/assets/images/avatars/127.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/128.jpg b/app/assets/images/avatars/128.jpg
deleted file mode 100644
index 8b83526dde1..00000000000
Binary files a/app/assets/images/avatars/128.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/129.jpg b/app/assets/images/avatars/129.jpg
deleted file mode 100644
index febde00da72..00000000000
Binary files a/app/assets/images/avatars/129.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/13.jpg b/app/assets/images/avatars/13.jpg
deleted file mode 100644
index ef0af0f5725..00000000000
Binary files a/app/assets/images/avatars/13.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/130.jpg b/app/assets/images/avatars/130.jpg
deleted file mode 100644
index b273edbffa2..00000000000
Binary files a/app/assets/images/avatars/130.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/131.jpg b/app/assets/images/avatars/131.jpg
deleted file mode 100644
index bfa98c856b5..00000000000
Binary files a/app/assets/images/avatars/131.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/132.jpg b/app/assets/images/avatars/132.jpg
deleted file mode 100644
index 95b2853ff17..00000000000
Binary files a/app/assets/images/avatars/132.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/133.jpg b/app/assets/images/avatars/133.jpg
deleted file mode 100644
index 75aceadb5bc..00000000000
Binary files a/app/assets/images/avatars/133.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/134.jpg b/app/assets/images/avatars/134.jpg
deleted file mode 100644
index a8b41f26f19..00000000000
Binary files a/app/assets/images/avatars/134.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/135.jpg b/app/assets/images/avatars/135.jpg
deleted file mode 100644
index 0ea04ee28b7..00000000000
Binary files a/app/assets/images/avatars/135.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/136.jpg b/app/assets/images/avatars/136.jpg
deleted file mode 100644
index 4cf72453ce4..00000000000
Binary files a/app/assets/images/avatars/136.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/137.jpg b/app/assets/images/avatars/137.jpg
deleted file mode 100644
index 6962b18cd38..00000000000
Binary files a/app/assets/images/avatars/137.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/138.jpg b/app/assets/images/avatars/138.jpg
deleted file mode 100644
index df51a3c4996..00000000000
Binary files a/app/assets/images/avatars/138.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/14.jpg b/app/assets/images/avatars/14.jpg
deleted file mode 100644
index a75f00a59b7..00000000000
Binary files a/app/assets/images/avatars/14.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/15.jpg b/app/assets/images/avatars/15.jpg
deleted file mode 100644
index b733a49accc..00000000000
Binary files a/app/assets/images/avatars/15.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/16.jpg b/app/assets/images/avatars/16.jpg
deleted file mode 100644
index e3475ef53dd..00000000000
Binary files a/app/assets/images/avatars/16.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/17.jpg b/app/assets/images/avatars/17.jpg
deleted file mode 100644
index 4d7ef00868d..00000000000
Binary files a/app/assets/images/avatars/17.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/18.jpg b/app/assets/images/avatars/18.jpg
deleted file mode 100644
index d179eb8e067..00000000000
Binary files a/app/assets/images/avatars/18.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/19.jpg b/app/assets/images/avatars/19.jpg
deleted file mode 100644
index 3077d922114..00000000000
Binary files a/app/assets/images/avatars/19.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/2.jpg b/app/assets/images/avatars/2.jpg
deleted file mode 100644
index f33b4ec055c..00000000000
Binary files a/app/assets/images/avatars/2.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/20.jpg b/app/assets/images/avatars/20.jpg
deleted file mode 100644
index 6bd1cfb5671..00000000000
Binary files a/app/assets/images/avatars/20.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/21.jpg b/app/assets/images/avatars/21.jpg
deleted file mode 100644
index 86dca6b9305..00000000000
Binary files a/app/assets/images/avatars/21.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/22.jpg b/app/assets/images/avatars/22.jpg
deleted file mode 100644
index aa0181c1235..00000000000
Binary files a/app/assets/images/avatars/22.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/23.jpg b/app/assets/images/avatars/23.jpg
deleted file mode 100644
index c1b56de2e06..00000000000
Binary files a/app/assets/images/avatars/23.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/24.jpg b/app/assets/images/avatars/24.jpg
deleted file mode 100644
index 78e302e6871..00000000000
Binary files a/app/assets/images/avatars/24.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/25.jpg b/app/assets/images/avatars/25.jpg
deleted file mode 100644
index 93c9d81421b..00000000000
Binary files a/app/assets/images/avatars/25.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/26.jpg b/app/assets/images/avatars/26.jpg
deleted file mode 100644
index 163c060ffaa..00000000000
Binary files a/app/assets/images/avatars/26.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/27.jpg b/app/assets/images/avatars/27.jpg
deleted file mode 100644
index 34c999a05b3..00000000000
Binary files a/app/assets/images/avatars/27.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/28.jpg b/app/assets/images/avatars/28.jpg
deleted file mode 100644
index f2baa6f7e4b..00000000000
Binary files a/app/assets/images/avatars/28.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/29.jpg b/app/assets/images/avatars/29.jpg
deleted file mode 100644
index c5ffd0cb742..00000000000
Binary files a/app/assets/images/avatars/29.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/3.jpg b/app/assets/images/avatars/3.jpg
deleted file mode 100644
index 5199884e181..00000000000
Binary files a/app/assets/images/avatars/3.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/30.jpg b/app/assets/images/avatars/30.jpg
deleted file mode 100644
index 5b2012bb13e..00000000000
Binary files a/app/assets/images/avatars/30.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/31.jpg b/app/assets/images/avatars/31.jpg
deleted file mode 100644
index 1fd53318f76..00000000000
Binary files a/app/assets/images/avatars/31.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/32.jpg b/app/assets/images/avatars/32.jpg
deleted file mode 100644
index 1903fb73b69..00000000000
Binary files a/app/assets/images/avatars/32.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/33.jpg b/app/assets/images/avatars/33.jpg
deleted file mode 100644
index 87378327d58..00000000000
Binary files a/app/assets/images/avatars/33.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/34.jpg b/app/assets/images/avatars/34.jpg
deleted file mode 100644
index beceaad1f89..00000000000
Binary files a/app/assets/images/avatars/34.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/35.jpg b/app/assets/images/avatars/35.jpg
deleted file mode 100644
index 964e80b69b7..00000000000
Binary files a/app/assets/images/avatars/35.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/36.jpg b/app/assets/images/avatars/36.jpg
deleted file mode 100644
index 5e858d53c63..00000000000
Binary files a/app/assets/images/avatars/36.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/37.jpg b/app/assets/images/avatars/37.jpg
deleted file mode 100644
index 8c62dd38cf2..00000000000
Binary files a/app/assets/images/avatars/37.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/38.jpg b/app/assets/images/avatars/38.jpg
deleted file mode 100644
index 12b9d2dde36..00000000000
Binary files a/app/assets/images/avatars/38.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/39.jpg b/app/assets/images/avatars/39.jpg
deleted file mode 100644
index 5043c0e2a81..00000000000
Binary files a/app/assets/images/avatars/39.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/4.jpg b/app/assets/images/avatars/4.jpg
deleted file mode 100644
index b3561e09cab..00000000000
Binary files a/app/assets/images/avatars/4.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/40.jpg b/app/assets/images/avatars/40.jpg
deleted file mode 100644
index 8ecaa03810a..00000000000
Binary files a/app/assets/images/avatars/40.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/41.jpg b/app/assets/images/avatars/41.jpg
deleted file mode 100644
index 1deab2c54b2..00000000000
Binary files a/app/assets/images/avatars/41.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/42.jpg b/app/assets/images/avatars/42.jpg
deleted file mode 100644
index 6e8ca955577..00000000000
Binary files a/app/assets/images/avatars/42.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/43.jpg b/app/assets/images/avatars/43.jpg
deleted file mode 100644
index 9d602a8349e..00000000000
Binary files a/app/assets/images/avatars/43.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/44.jpg b/app/assets/images/avatars/44.jpg
deleted file mode 100644
index 656ba0fd9c5..00000000000
Binary files a/app/assets/images/avatars/44.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/45.jpg b/app/assets/images/avatars/45.jpg
deleted file mode 100644
index 8b9a28eb6e3..00000000000
Binary files a/app/assets/images/avatars/45.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/46.jpg b/app/assets/images/avatars/46.jpg
deleted file mode 100644
index abf62df72de..00000000000
Binary files a/app/assets/images/avatars/46.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/47.jpg b/app/assets/images/avatars/47.jpg
deleted file mode 100644
index f736eba3de5..00000000000
Binary files a/app/assets/images/avatars/47.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/48.jpg b/app/assets/images/avatars/48.jpg
deleted file mode 100644
index 3afc22b7a95..00000000000
Binary files a/app/assets/images/avatars/48.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/49.jpg b/app/assets/images/avatars/49.jpg
deleted file mode 100644
index a71e67c8f96..00000000000
Binary files a/app/assets/images/avatars/49.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/5.jpg b/app/assets/images/avatars/5.jpg
deleted file mode 100644
index aa888ce038a..00000000000
Binary files a/app/assets/images/avatars/5.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/50.jpg b/app/assets/images/avatars/50.jpg
deleted file mode 100644
index 47498194a8c..00000000000
Binary files a/app/assets/images/avatars/50.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/51.jpg b/app/assets/images/avatars/51.jpg
deleted file mode 100644
index f24b184f29e..00000000000
Binary files a/app/assets/images/avatars/51.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/52.jpg b/app/assets/images/avatars/52.jpg
deleted file mode 100644
index c8eb28b96a3..00000000000
Binary files a/app/assets/images/avatars/52.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/53.jpg b/app/assets/images/avatars/53.jpg
deleted file mode 100644
index fed2bd52bec..00000000000
Binary files a/app/assets/images/avatars/53.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/54.jpg b/app/assets/images/avatars/54.jpg
deleted file mode 100644
index 6068a2b4d32..00000000000
Binary files a/app/assets/images/avatars/54.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/55.jpg b/app/assets/images/avatars/55.jpg
deleted file mode 100644
index 9ecb6dfce66..00000000000
Binary files a/app/assets/images/avatars/55.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/56.jpg b/app/assets/images/avatars/56.jpg
deleted file mode 100644
index b8ce39f4db8..00000000000
Binary files a/app/assets/images/avatars/56.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/57.jpg b/app/assets/images/avatars/57.jpg
deleted file mode 100644
index becf5faf2dd..00000000000
Binary files a/app/assets/images/avatars/57.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/58.jpg b/app/assets/images/avatars/58.jpg
deleted file mode 100644
index a244807eb88..00000000000
Binary files a/app/assets/images/avatars/58.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/59.jpg b/app/assets/images/avatars/59.jpg
deleted file mode 100644
index 93ec84f4bf3..00000000000
Binary files a/app/assets/images/avatars/59.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/6.jpg b/app/assets/images/avatars/6.jpg
deleted file mode 100644
index 9a36246b6f6..00000000000
Binary files a/app/assets/images/avatars/6.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/60.jpg b/app/assets/images/avatars/60.jpg
deleted file mode 100644
index 86b8cb1562e..00000000000
Binary files a/app/assets/images/avatars/60.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/61.jpg b/app/assets/images/avatars/61.jpg
deleted file mode 100644
index 329264f2000..00000000000
Binary files a/app/assets/images/avatars/61.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/62.jpg b/app/assets/images/avatars/62.jpg
deleted file mode 100644
index 15416ae82cc..00000000000
Binary files a/app/assets/images/avatars/62.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/63.jpg b/app/assets/images/avatars/63.jpg
deleted file mode 100644
index c5cebab3ad2..00000000000
Binary files a/app/assets/images/avatars/63.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/64.jpg b/app/assets/images/avatars/64.jpg
deleted file mode 100644
index d991f98e2f0..00000000000
Binary files a/app/assets/images/avatars/64.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/65.jpg b/app/assets/images/avatars/65.jpg
deleted file mode 100644
index 4d792acfb1d..00000000000
Binary files a/app/assets/images/avatars/65.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/66.jpg b/app/assets/images/avatars/66.jpg
deleted file mode 100644
index edca436cd5a..00000000000
Binary files a/app/assets/images/avatars/66.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/67.jpg b/app/assets/images/avatars/67.jpg
deleted file mode 100644
index 85e6554a61a..00000000000
Binary files a/app/assets/images/avatars/67.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/68.jpg b/app/assets/images/avatars/68.jpg
deleted file mode 100644
index 625e396ede5..00000000000
Binary files a/app/assets/images/avatars/68.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/69.jpg b/app/assets/images/avatars/69.jpg
deleted file mode 100644
index 8a0ccc375b4..00000000000
Binary files a/app/assets/images/avatars/69.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/7.jpg b/app/assets/images/avatars/7.jpg
deleted file mode 100644
index 8c04d50e06c..00000000000
Binary files a/app/assets/images/avatars/7.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/70.jpg b/app/assets/images/avatars/70.jpg
deleted file mode 100644
index 0e33b149d3b..00000000000
Binary files a/app/assets/images/avatars/70.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/71.jpg b/app/assets/images/avatars/71.jpg
deleted file mode 100644
index dba82d8173f..00000000000
Binary files a/app/assets/images/avatars/71.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/72.jpg b/app/assets/images/avatars/72.jpg
deleted file mode 100644
index 399336bedf6..00000000000
Binary files a/app/assets/images/avatars/72.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/73.jpg b/app/assets/images/avatars/73.jpg
deleted file mode 100644
index 2ee65c7f154..00000000000
Binary files a/app/assets/images/avatars/73.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/74.jpg b/app/assets/images/avatars/74.jpg
deleted file mode 100644
index 75cc0d4af3d..00000000000
Binary files a/app/assets/images/avatars/74.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/75.jpg b/app/assets/images/avatars/75.jpg
deleted file mode 100644
index fff0bf15182..00000000000
Binary files a/app/assets/images/avatars/75.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/76.jpg b/app/assets/images/avatars/76.jpg
deleted file mode 100644
index c70857272c8..00000000000
Binary files a/app/assets/images/avatars/76.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/77.jpg b/app/assets/images/avatars/77.jpg
deleted file mode 100644
index e254f097d3a..00000000000
Binary files a/app/assets/images/avatars/77.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/78.jpg b/app/assets/images/avatars/78.jpg
deleted file mode 100644
index 0d311ef663c..00000000000
Binary files a/app/assets/images/avatars/78.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/79.jpg b/app/assets/images/avatars/79.jpg
deleted file mode 100644
index c0f4c5eda7d..00000000000
Binary files a/app/assets/images/avatars/79.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/8.jpg b/app/assets/images/avatars/8.jpg
deleted file mode 100644
index ed907a9d55d..00000000000
Binary files a/app/assets/images/avatars/8.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/80.jpg b/app/assets/images/avatars/80.jpg
deleted file mode 100644
index 9100ac281a5..00000000000
Binary files a/app/assets/images/avatars/80.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/81.jpg b/app/assets/images/avatars/81.jpg
deleted file mode 100644
index fe1abfd1762..00000000000
Binary files a/app/assets/images/avatars/81.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/82.jpg b/app/assets/images/avatars/82.jpg
deleted file mode 100644
index c2b3e07e5b1..00000000000
Binary files a/app/assets/images/avatars/82.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/83.jpg b/app/assets/images/avatars/83.jpg
deleted file mode 100644
index 895cd08bf53..00000000000
Binary files a/app/assets/images/avatars/83.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/84.jpg b/app/assets/images/avatars/84.jpg
deleted file mode 100644
index f3278f29095..00000000000
Binary files a/app/assets/images/avatars/84.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/85.jpg b/app/assets/images/avatars/85.jpg
deleted file mode 100644
index 4513811cd42..00000000000
Binary files a/app/assets/images/avatars/85.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/86.jpg b/app/assets/images/avatars/86.jpg
deleted file mode 100644
index 4d814a88643..00000000000
Binary files a/app/assets/images/avatars/86.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/87.jpg b/app/assets/images/avatars/87.jpg
deleted file mode 100644
index 119101b8dc6..00000000000
Binary files a/app/assets/images/avatars/87.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/88.jpg b/app/assets/images/avatars/88.jpg
deleted file mode 100644
index f2aa09749ba..00000000000
Binary files a/app/assets/images/avatars/88.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/89.jpg b/app/assets/images/avatars/89.jpg
deleted file mode 100644
index e3c90140c32..00000000000
Binary files a/app/assets/images/avatars/89.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/9.jpg b/app/assets/images/avatars/9.jpg
deleted file mode 100644
index ea9d5c3afa5..00000000000
Binary files a/app/assets/images/avatars/9.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/90.jpg b/app/assets/images/avatars/90.jpg
deleted file mode 100644
index 18d895ffb76..00000000000
Binary files a/app/assets/images/avatars/90.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/91.jpg b/app/assets/images/avatars/91.jpg
deleted file mode 100644
index cbd3c97da13..00000000000
Binary files a/app/assets/images/avatars/91.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/92.jpg b/app/assets/images/avatars/92.jpg
deleted file mode 100644
index aa5b12156ed..00000000000
Binary files a/app/assets/images/avatars/92.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/93.jpg b/app/assets/images/avatars/93.jpg
deleted file mode 100644
index 6d4042a7a1d..00000000000
Binary files a/app/assets/images/avatars/93.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/94.jpg b/app/assets/images/avatars/94.jpg
deleted file mode 100644
index 4ee77cd453f..00000000000
Binary files a/app/assets/images/avatars/94.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/95.jpg b/app/assets/images/avatars/95.jpg
deleted file mode 100644
index dfafa89c443..00000000000
Binary files a/app/assets/images/avatars/95.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/96.jpg b/app/assets/images/avatars/96.jpg
deleted file mode 100644
index 50a2fdf0d34..00000000000
Binary files a/app/assets/images/avatars/96.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/97.jpg b/app/assets/images/avatars/97.jpg
deleted file mode 100644
index 9de3139140c..00000000000
Binary files a/app/assets/images/avatars/97.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/98.jpg b/app/assets/images/avatars/98.jpg
deleted file mode 100644
index 3459eeadaa4..00000000000
Binary files a/app/assets/images/avatars/98.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/99.jpg b/app/assets/images/avatars/99.jpg
deleted file mode 100644
index fd61d20d640..00000000000
Binary files a/app/assets/images/avatars/99.jpg and /dev/null differ
diff --git a/app/assets/images/avatars/rename.rb b/app/assets/images/avatars/rename.rb
deleted file mode 100644
index 5fc145287c5..00000000000
--- a/app/assets/images/avatars/rename.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-all_files = [Dir["*.jpg"] + Dir["*.jpeg"]].flatten
-all_files.each do |f|
-  File.rename(f, "#{rand(2**256).to_s(36)[0..7]}.jpg")
-end
-
-all_files = [Dir["*.jpg"] + Dir["*.jpeg"]].flatten
-all_files.each_with_index do |f, i|
-  File.rename(f, "#{i}.jpg")
-end
diff --git a/app/assets/images/cool_avatars/coding_horror.png b/app/assets/images/cool_avatars/coding_horror.png
deleted file mode 100644
index b2ef339d232..00000000000
Binary files a/app/assets/images/cool_avatars/coding_horror.png and /dev/null differ
diff --git a/app/assets/images/cool_avatars/evil_trout.jpg b/app/assets/images/cool_avatars/evil_trout.jpg
deleted file mode 100644
index d46c42e4f5b..00000000000
Binary files a/app/assets/images/cool_avatars/evil_trout.jpg and /dev/null differ
diff --git a/app/assets/images/cool_avatars/hanzo.png b/app/assets/images/cool_avatars/hanzo.png
deleted file mode 100644
index 1dcf8e0f100..00000000000
Binary files a/app/assets/images/cool_avatars/hanzo.png and /dev/null differ
diff --git a/app/assets/images/cool_avatars/sam.png b/app/assets/images/cool_avatars/sam.png
deleted file mode 100644
index 068a638bcfd..00000000000
Binary files a/app/assets/images/cool_avatars/sam.png and /dev/null differ
diff --git a/app/assets/images/d-logo-sketch-small.png b/app/assets/images/d-logo-sketch-small.png
new file mode 100644
index 00000000000..3467f147f55
Binary files /dev/null and b/app/assets/images/d-logo-sketch-small.png differ
diff --git a/app/assets/images/d-logo-sketch.png b/app/assets/images/d-logo-sketch.png
new file mode 100755
index 00000000000..56f3284fd3e
Binary files /dev/null and b/app/assets/images/d-logo-sketch.png differ
diff --git a/app/assets/images/default-favicon.png b/app/assets/images/default-favicon.png
new file mode 100644
index 00000000000..37f8ac9a0c0
Binary files /dev/null and b/app/assets/images/default-favicon.png differ
diff --git a/app/assets/images/thread-default.png b/app/assets/images/thread-default.png
deleted file mode 100644
index 0e12b0d0ad7..00000000000
Binary files a/app/assets/images/thread-default.png and /dev/null differ
diff --git a/app/assets/javascripts/discourse/components/div_resizer.js.coffee b/app/assets/javascripts/discourse/components/div_resizer.js.coffee
index 19cf0918bc2..0b4c3683343 100644
--- a/app/assets/javascripts/discourse/components/div_resizer.js.coffee
+++ b/app/assets/javascripts/discourse/components/div_resizer.js.coffee
@@ -29,6 +29,7 @@
     thisMousePos = mousePosition(e).y
     size = originalDivHeight + (originalPos - thisMousePos)
     lastMousePos = thisMousePos
+    size = Math.min(size, $(window).height())
     size = Math.max(min, size)
     div.height size + "px"
     endDrag e,opts if size < min
diff --git a/app/assets/javascripts/discourse/models/post.js.coffee.erb b/app/assets/javascripts/discourse/models/post.js.coffee.erb
index 564512e454a..038611e7b59 100644
--- a/app/assets/javascripts/discourse/models/post.js.coffee.erb
+++ b/app/assets/javascripts/discourse/models/post.js.coffee.erb
@@ -173,6 +173,27 @@ window.Discourse.Post = Ember.Object.extend Discourse.Presence,
   loadVersions: (callback) ->
     $.get "/posts/#{@get('id')}/versions.json", (result) -> callback(result)  
 
+
+  # Whether to show replies directly below 
+  showRepliesBelow: (->
+    reply_count = @get('reply_count')
+
+    # We don't show replies if there aren't any
+    return false if reply_count is 0
+
+    # Always show replies if the setting `supress_reply_directly_below` is false.
+    return true unless Discourse.SiteSettings.supress_reply_directly_below
+
+    # Always show replies if there's more than one
+    return true if reply_count > 1
+    
+    # If we have *exactly* one reply, we have to consider if it's directly below us
+    return false if @get('topic')?.isReplyDirectlyBelow(@)
+
+    true
+
+  ).property('reply_count')
+
 window.Discourse.Post.reopenClass
 
   REGULAR_TYPE: <%= Post::REGULAR %>
diff --git a/app/assets/javascripts/discourse/models/topic.js.coffee b/app/assets/javascripts/discourse/models/topic.js.coffee
index cba49d52f48..30705f4a0e9 100644
--- a/app/assets/javascripts/discourse/models/topic.js.coffee
+++ b/app/assets/javascripts/discourse/models/topic.js.coffee
@@ -243,6 +243,18 @@ Discourse.Topic = Discourse.Model.extend Discourse.Presence,
     newPosts.each (p)->
       posts.pushObject(p) unless map[p.get('post_number')]
 
+  # Is the reply to a post directly below it?
+  isReplyDirectlyBelow: (post) ->
+    posts = @get('posts')
+    return unless posts
+
+    postBelow = posts[posts.indexOf(post) + 1]
+
+    # If the post directly below's reply_to_post_number is our post number, it's
+    # considered directly below.
+    return postBelow?.get('reply_to_post_number') is post.get('post_number')
+
+
 window.Discourse.Topic.reopenClass
 
   NotificationLevel:
diff --git a/app/assets/javascripts/discourse/routes/list_category_route.js.coffee b/app/assets/javascripts/discourse/routes/list_category_route.js.coffee
index dfd1519ec5b..5e38ad1acd2 100644
--- a/app/assets/javascripts/discourse/routes/list_category_route.js.coffee
+++ b/app/assets/javascripts/discourse/routes/list_category_route.js.coffee
@@ -1,10 +1,13 @@
 window.Discourse.ListCategoryRoute = Discourse.FilteredListRoute.extend
-  serialize: (params) -> slug: params.get('slug')
-
   setupController: (controller, model) ->
+
+    slug = Em.get(model, 'slug')
+    category = Discourse.get('site.categories').findProperty('slug', slug)
+    category ||= Discourse.Category.create(name: slug, slug: slug)
+
     listController = @controllerFor('list')
-    listController.set('filterMode', "category/#{model.slug}")
-    listController.load("category/#{model.slug}").then (topicList) =>
+    listController.set('filterMode', "category/#{category.get('slug')}")
+    listController.load("category/#{category.get('slug')}").then (topicList) =>
       listController.set('canCreateTopic', topicList.get('can_create_topic'))
-      listController.set('category', Discourse.Category.create(name: model.slug))
+      listController.set('category',category)
       @controllerFor('listTopics').set('content', topicList)
diff --git a/app/assets/javascripts/discourse/views/post_menu_view.js.coffee b/app/assets/javascripts/discourse/views/post_menu_view.js.coffee
index 75855407f07..bf884bbcfea 100644
--- a/app/assets/javascripts/discourse/views/post_menu_view.js.coffee
+++ b/app/assets/javascripts/discourse/views/post_menu_view.js.coffee
@@ -26,15 +26,13 @@ window.Discourse.PostMenuView = Ember.View.extend Discourse.Presence,
   # Trigger re rendering
   needsToRender: (->
     @rerender()
-  ).observes('post.deleted_at', 'post.flagsAvailable.@each', 'post.url', 'post.bookmarked', 'post.reply_count', 'post.can_delete')
+  ).observes('post.deleted_at', 'post.flagsAvailable.@each', 'post.url', 'post.bookmarked', 'post.reply_count', 'post.showRepliesBelow', 'post.can_delete')
 
   # Replies Button
   renderReplies: (post, buffer) ->
 
-    return if @get('post.replyFollowing')
-
+    return unless post.get('showRepliesBelow')
     reply_count = post.get('reply_count')
-    return if reply_count == 0
 
     buffer.push("<button class='show-replies' data-action='replies'>")
     buffer.push("<span class='badge-posts'>#{reply_count}</span>")
@@ -97,7 +95,6 @@ window.Discourse.PostMenuView = Ember.View.extend Discourse.Presence,
 
   clickReply: -> @get('controller').replyToPost(@get('post'))
 
-
   # Bookmark button
   renderBookmark: (post, buffer) ->
     return unless Discourse.get('currentUser')
diff --git a/app/assets/stylesheets/application/discourse.css.scss b/app/assets/stylesheets/application/discourse.css.scss
index 4ceb5c82de6..fd3c2b74bc3 100644
--- a/app/assets/stylesheets/application/discourse.css.scss
+++ b/app/assets/stylesheets/application/discourse.css.scss
@@ -306,5 +306,4 @@ blockquote {
 
 .profiler-results.profiler-left {
   top: 60px !important;
-}
-
+}
\ No newline at end of file
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 62757c7b9db..ef2092d7f62 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -35,7 +35,7 @@ class ListController < ApplicationController
     list = nil
 
     # If they choose uncategorized, return topics NOT in a category
-    if params[:category] == SiteSetting.uncategorized_name
+    if params[:category] == Slug.for(SiteSetting.uncategorized_name) or params[:category] == SiteSetting.uncategorized_name
       list = query.list_uncategorized
     else
       category = Category.where(slug: params[:category]).includes(:featured_users).first
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 476cc29cd31..e6adfa53a51 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -15,86 +15,21 @@ class TopicsController < ApplicationController
                                           :unmute,
                                           :set_notifications,
                                           :move_posts]
+  before_filter :consider_user_for_promotion, only: :show
 
   skip_before_filter :check_xhr, only: [:avatar, :show]
   caches_action :avatar, :cache_path => Proc.new {|c| "#{c.params[:post_number]}-#{c.params[:topic_id]}" }
 
+
   def show
-
-    # Consider the user for a promotion if they're new
-    if current_user.present?
-      Promotion.new(current_user).review if current_user.trust_level == TrustLevel.Levels[:new]
-    end
-
-    @topic_view = TopicView.new(params[:id] || params[:topic_id],
-                                current_user,
-                                username_filters: params[:username_filters],
-                                best_of: params[:best_of],
-                                page: params[:page])
+    create_topic_view
 
     anonymous_etag(@topic_view.topic) do
-      # force the correct slug
-      if params[:slug] && @topic_view.topic.slug != params[:slug]
-        fullpath = request.fullpath
-
-        split = fullpath.split('/')
-        split[2] = @topic_view.topic.slug
-
-        redirect_to split.join('/'), status: 301
-        return
-      end
-
-      # Figure out what we're filter on
-      if params[:post_number].present?
-        # Get posts near a post
-        @topic_view.filter_posts_near(params[:post_number].to_i)
-      elsif params[:posts_before].present?
-        @topic_view.filter_posts_before(params[:posts_before].to_i)
-      elsif params[:posts_after].present?
-        @topic_view.filter_posts_after(params[:posts_after].to_i)
-      else
-        # No filter? Consider it a paged view, default to page 0 which is the first segment
-        @topic_view.filter_posts_paged(params[:page].to_i)
-      end
+      redirect_to_correct_topic and return if slugs_do_not_match
       View.create_for(@topic_view.topic, request.remote_ip, current_user)
-
-      @topic_view.draft_key = @topic_view.topic.draft_key
-      @topic_view.draft_sequence = DraftSequence.current(current_user, @topic_view.draft_key)
-
-      if (!request.xhr? || params[:track_visit]) && current_user
-        TopicUser.track_visit! @topic_view.topic, current_user
-        @topic_view.draft = Draft.get(current_user, @topic_view.draft_key, @topic_view.draft_sequence)
-      end
-
-      topic_view_serializer = TopicViewSerializer.new(@topic_view, scope: guardian, root: false)
-
-      respond_to do |format|
-        format.html do
-          @canonical = "#{request.protocol}#{request.host_with_port}" + @topic_view.topic.relative_url
-
-          if params[:post_number]
-            @post = @topic_view.posts.select{|p| p.post_number == params[:post_number].to_i}.first
-            page = ((params[:post_number].to_i - 1) / SiteSetting.posts_per_page) + 1
-            @canonical << "?page=#{page}" if page > 1
-          else
-            @canonical << "?page=#{params[:page]}" if params[:page] && params[:page].to_i > 1
-          end
-
-          last_post = @topic_view.posts[-1]
-          if last_post.present? and (@topic_view.topic.highest_post_number > last_post.post_number)
-            @next_page = (@topic_view.posts[0].post_number / SiteSetting.posts_per_page) + 1
-          end
-
-          store_preloaded("topic_#{@topic_view.topic.id}", MultiJson.dump(topic_view_serializer))
-        end
-
-        format.json do
-          render_json_dump(topic_view_serializer)
-        end
-
-      end
+      track_visit_to_topic
+      perform_show_response
     end
-
   end
 
   def destroy_timings
@@ -241,12 +176,56 @@ class TopicsController < ApplicationController
 
   private
 
-    def toggle_mute(v)
-      @topic = Topic.where(id: params[:topic_id].to_i).first
-      guardian.ensure_can_see!(@topic)
+  def create_topic_view
+    opts = params.slice(:username_filters, :best_of, :page, :post_number, :posts_before, :posts_after)
+    @topic_view = TopicView.new(params[:id] || params[:topic_id], current_user, opts)
+  end
 
-      @topic.toggle_mute(current_user, v)
-      render nothing: true
+  def toggle_mute(v)
+    @topic = Topic.where(id: params[:topic_id].to_i).first
+    guardian.ensure_can_see!(@topic)
+
+    @topic.toggle_mute(current_user, v)
+    render nothing: true
+  end
+
+  def consider_user_for_promotion
+    Promotion.new(current_user).review if current_user.present?
+  end
+
+  def slugs_do_not_match
+    params[:slug] && @topic_view.topic.slug != params[:slug]
+  end
+
+  def redirect_to_correct_topic
+    fullpath = request.fullpath
+
+    split = fullpath.split('/')
+    split[2] = @topic_view.topic.slug
+
+    redirect_to split.join('/'), status: 301
+  end
+
+  def track_visit_to_topic
+    return unless should_track_visit_to_topic?
+    TopicUser.track_visit! @topic_view.topic, current_user
+    @topic_view.draft = Draft.get(current_user, @topic_view.draft_key, @topic_view.draft_sequence)
+  end
+
+  def should_track_visit_to_topic?
+    (!request.xhr? || params[:track_visit]) && current_user
+  end
+
+  def perform_show_response
+    topic_view_serializer = TopicViewSerializer.new(@topic_view, scope: guardian, root: false)
+    respond_to do |format|
+      format.html do
+        store_preloaded("topic_#{@topic_view.topic.id}", MultiJson.dump(topic_view_serializer))
+      end
+
+      format.json do
+        render_json_dump(topic_view_serializer)
+      end
     end
-
+  end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 03a70c2cbdf..649a9c758e0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -142,6 +142,7 @@ class UsersController < ApplicationController
     if auth && auth[:email] == params[:email] && auth[:email_valid]
       user.active = true
     end
+    user.password_required unless auth
 
     Mothership.register_nickname( user.username, user.email ) if user.valid? and SiteSetting.call_mothership?
 
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 8a0cec9ff83..09d5556363c 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -30,7 +30,7 @@ class CategoryList
 
 
       uncategorized = Category.new({name: SiteSetting.uncategorized_name,
-                                   slug: SiteSetting.uncategorized_name,
+                                   slug: Slug.for(SiteSetting.uncategorized_name),
                                    featured_topics: uncategorized_topics}.merge(totals))
 
       # Find the appropriate place to insert it:
diff --git a/app/models/post.rb b/app/models/post.rb
index 496224570c3..b97aa40af49 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -115,10 +115,21 @@ class Post < ActiveRecord::Base
     self.cooked = nil
   end
 
+  def self.white_listed_image_classes
+    @white_listed_image_classes ||= ['avatar']
+  end
+
   def image_count
     return 0 unless self.raw.present?
-    cooked_document.search("img.emoji").remove
-    cooked_document.search("img").count
+
+    cooked_document.search("img").reject{ |t|
+      dom_class = t["class"]
+      if dom_class
+        (Post.white_listed_image_classes & dom_class.split(" ")).count > 0
+      else
+        false
+      end
+    }.count
   end
 
   def link_count
diff --git a/app/models/post_alert_observer.rb b/app/models/post_alert_observer.rb
index 2fb9164546e..08112cb58cf 100644
--- a/app/models/post_alert_observer.rb
+++ b/app/models/post_alert_observer.rb
@@ -101,7 +101,7 @@ class PostAlertObserver < ActiveRecord::Observer
       result = []
       post.raw.scan(/\[quote=\"([^,]+),.+\"\]/).uniq.each do |m|
         username = m.first.strip.downcase
-        user = User.where("(LOWER(username_lower) = :username or LOWER(name) = :username) and id != :id", username: username, id: post.user_id).first
+        user = User.where("username_lower = :username and id != :id", username: username, id: post.user_id).first
         result << user if user.present?
       end
       result
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index 37ec0810eab..657aabd023f 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -10,8 +10,8 @@ class SiteSetting < ActiveRecord::Base
 
   # settings available in javascript under Discourse.SiteSettings
   client_setting(:title, "Discourse")
-  client_setting(:logo_url, '/assets/logo.png')
-  client_setting(:logo_small_url, '')
+  client_setting(:logo_url, '/assets/d-logo-sketch.png')
+  client_setting(:logo_small_url, '/assets/d-logo-sketch-small.png')
   client_setting(:traditional_markdown_linebreaks, false)
   client_setting(:popup_delay, 1500)
   client_setting(:top_menu, 'popular|new|unread|favorited|categories')
@@ -29,6 +29,7 @@ class SiteSetting < ActiveRecord::Base
   client_setting(:min_topic_title_length, 5)
   client_setting(:max_topic_title_length, 255)
   client_setting(:flush_timings_secs, 5)
+  client_setting(:supress_reply_directly_below, true)
 
   # settings only available server side
   setting(:auto_track_topics_after, 60000)
@@ -57,7 +58,7 @@ class SiteSetting < ActiveRecord::Base
   setting(:invite_expiry_days, 14)
   setting(:active_user_rate_limit_secs, 60)
   setting(:previous_visit_timeout_hours, 1)
-  setting(:favicon_url, '/assets/favicon.ico')
+  setting(:favicon_url, '/assets/default-favicon.png')
 
   setting(:ninja_edit_window, 5.minutes.to_i)
   setting(:post_undo_action_window_mins, 10)
@@ -136,6 +137,8 @@ class SiteSetting < ActiveRecord::Base
   # Ways to catch griefers and other nasties
   setting(:email_blacklist_regexp, '')
 
+
+
   def self.call_mothership?
     self.enforce_global_nicknames? and self.discourse_org_access_key.present?
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 41dac47d71c..423ebd26b41 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -131,11 +131,12 @@ class User < ActiveRecord::Base
   end
 
   def change_username(new_username)
+    current_username = self.username
     self.username = new_username
 
     if SiteSetting.call_mothership? and self.valid?
       begin
-        Mothership.register_nickname( self.username, self.email )
+        Mothership.change_nickname( current_username, new_username )
       rescue Mothership::NicknameUnavailable
         return false
       rescue => e
@@ -240,6 +241,11 @@ class User < ActiveRecord::Base
     end
   end
 
+  # Indicate that this is NOT a passwordless account for the purposes of validation
+  def password_required
+    @password_required = true
+  end
+
   def confirm_password?(password)
     return false unless self.password_hash && self.salt
     self.password_hash == hash_password(password,self.salt)
@@ -381,7 +387,7 @@ class User < ActiveRecord::Base
   end
 
   def email_confirmed?
-    email_tokens.where(email: self.email, confirmed: true).present?
+    email_tokens.where(email: self.email, confirmed: true).present? or email_tokens.count == 0
   end
 
 
@@ -454,8 +460,8 @@ class User < ActiveRecord::Base
     end
 
     def password_validator
-      if @raw_password
-        return errors.add(:password, "must be 6 letters or longer") if @raw_password.length < 6
+      if (@raw_password and @raw_password.length < 6) or (@password_required and !@raw_password)
+        return errors.add(:password, "must be 6 letters or longer")
       end
     end
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f314b2819a0..ee7716ebcd8 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title><%=t :title%></title>
-    <meta content="width=device-width, initial-scale=1.0" name="viewport">
+    <meta name="viewport" content="target-densitydpi=device-dpi, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
     <meta content="" name="description">
     <meta content="" name="author">
     <%- 
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 10cce08499b..468841f1594 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -1,10 +1,11 @@
-<table class="topic-list">
+<div class="topic-list">
 <% @list.topics.each do |t| %>
-  <tr>
-    <td><a href="<%= t.relative_url %>"><%= t.title %></a> <span title='total posts'>[<%= t.posts_count %>]</span></td>
-  </tr>
+<a href="<%= t.relative_url %>"><%= t.title %></a> <span title='posts'>(<%= t.posts_count %>)</span><br/>
 <% end %>
-</table>
+</div>
+
 <% if @list.topics.length > 0 %>
-<a href="<%= @list.more_topics_url.sub('.json?','?') %>">next page</a>
+<p><a href="<%= @list.more_topics_url.sub('.json?','?') %>">next page &rarr;</a></p>
 <% end %>
+
+<p>Powered by <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled</p>
\ No newline at end of file
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 869cd21c099..e4125c15dcf 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -1,20 +1,26 @@
 <h2>
-  <%= render_topic_title(@topic_view.topic) %>
-
+  <a href="<%= @topic_view.relative_url %>"><%= @topic_view.title %></a>
 </h2>
-<% (@post ? [@post] : @topic_view.posts).each do |post| %>
+<hr/>
+
+<% @topic_view.posts.each do |post| %>
   <div class='creator'>
     #<%=post.post_number%> By: <b><%= post.user.name %></b>, <%= post.created_at.to_formatted_s(:long_ordinal) %>
   </div>
   <div class='post'>
     <%= post.cooked.html_safe %>
   </div>
+  <hr/>
 <% end %>
 
-<% if @next_page%>
+<% if @topic_view.next_page %>
   <p>
-  <b><%= render_topic_next_page_link(@topic_view.topic, @next_page) %></b>
+    <a href="<%= @topic_view.next_page_path %>">next page &rarr;</a>
   </p>
 <% end %>
 
-<%- content_for :canonical do %><%= @canonical %><%- end %>
+<%- content_for :canonical do %>
+  <%= "#{request.protocol}#{request.host_with_port}#{@topic_view.canonical_path}" %>
+<%- end %>
+
+<p>Powered by <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled</p>
\ No newline at end of file
diff --git a/chef/.librarian/chef/config b/chef/.librarian/chef/config
new file mode 100644
index 00000000000..691ee08e4b8
--- /dev/null
+++ b/chef/.librarian/chef/config
@@ -0,0 +1,3 @@
+---
+LIBRARIAN_CHEF_INSTALL__STRIP_DOT_GIT: '1'
+
diff --git a/chef/Cheffile b/chef/Cheffile
new file mode 100644
index 00000000000..4d091225a44
--- /dev/null
+++ b/chef/Cheffile
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+#^syntax detection
+
+site 'http://community.opscode.com/api/v1'
+
+cookbook 'apt'
+cookbook 'vim'
+cookbook 'phantomjs'
+cookbook 'build-essential'
+cookbook 'omnibus_updater'
diff --git a/chef/Cheffile.lock b/chef/Cheffile.lock
new file mode 100644
index 00000000000..c44e50a99b8
--- /dev/null
+++ b/chef/Cheffile.lock
@@ -0,0 +1,16 @@
+SITE
+  remote: http://community.opscode.com/api/v1
+  specs:
+    apt (1.8.4)
+    build-essential (1.3.4)
+    omnibus_updater (0.1.2)
+    phantomjs (0.0.10)
+    vim (1.0.2)
+
+DEPENDENCIES
+  apt (>= 0)
+  build-essential (>= 0)
+  omnibus_updater (>= 0)
+  phantomjs (>= 0)
+  vim (>= 0)
+
diff --git a/chef/cookbooks/apt/.gitignore b/chef/cookbooks/apt/.gitignore
new file mode 100644
index 00000000000..fc5b76d486d
--- /dev/null
+++ b/chef/cookbooks/apt/.gitignore
@@ -0,0 +1,4 @@
+.bundle
+.cache
+.kitchen
+bin
diff --git a/chef/cookbooks/apt/CHANGELOG.md b/chef/cookbooks/apt/CHANGELOG.md
new file mode 100644
index 00000000000..2f2c53caaa7
--- /dev/null
+++ b/chef/cookbooks/apt/CHANGELOG.md
@@ -0,0 +1,70 @@
+## v1.8.4:
+
+* [COOK-2171] - Update README to clarify required Chef version: 10.18.0
+  or higher.
+
+## v1.8.2:
+
+* [COOK-2112] - need [] around "arch" in sources.list entries
+* [COOK-2171] - fixes a regression in the notification
+
+## v1.8.0:
+
+* [COOK-2143] - Allow for a custom cacher-ng port
+* [COOK-2171] - On `apt_repository.run_action(:add)` the source file
+  is not created.
+* [COOK-2184] - apt::cacher-ng, use `cacher_port` attribute in
+  acng.conf
+
+## v1.7.0:
+
+* [COOK-2082] - add "arch" parameter to apt_repository LWRP
+
+## v1.6.0:
+
+* [COOK-1893] - `apt_preference` use "`package_name`" resource instead of "name"
+* [COOK-1894] - change filename for sources.list.d files
+* [COOK-1914] - Wrong dir permissions for /etc/apt/preferences.d/
+* [COOK-1942] - README.md has wrong name for the keyserver attribute
+* [COOK-2019] - create 01proxy before any other apt-get updates get executed
+
+## v1.5.2:
+
+* [COOK-1682] - use template instead of file resource in apt::cacher-client
+* [COOK-1875] - cacher-client should be Environment-aware
+
+## V1.5.0:
+
+* [COOK-1500] - Avoid triggering apt-get update
+* [COOK-1548] - Add execute commands for autoclean and autoremove
+* [COOK-1591] - Setting up the apt proxy should leave https
+  connections direct
+* [COOK-1596] - execute[apt-get-update-periodic] never runs
+* [COOK-1762] - create /etc/apt/preferences.d directory
+* [COOK-1776] - apt key check isn't idempotent
+
+## v1.4.8:
+
+* Adds test-kitchen support
+* [COOK-1435] - repository lwrp is not idempotent with http key
+
+## v1.4.6:
+
+* [COOK-1530] - apt_repository isn't aware of update-success-stamp
+  file (also reverts COOK-1382 patch).
+
+## v1.4.4:
+
+* [COOK-1229] - Allow cacher IP to be set manually in non-Chef Solo
+  environments
+* [COOK-1530] - Immediately update apt-cache when sources.list file is dropped off
+
+## v1.4.2:
+
+* [COOK-1155] - LWRP for apt pinning
+
+## v1.4.0:
+
+* [COOK-889] - overwrite existing repo source files
+* [COOK-921] - optionally use cookbook\_file or remote\_file for key
+* [COOK-1032] - fixes problem with apt repository key installation
diff --git a/chef/cookbooks/apt/CONTRIBUTING b/chef/cookbooks/apt/CONTRIBUTING
new file mode 100644
index 00000000000..89ac873b4f4
--- /dev/null
+++ b/chef/cookbooks/apt/CONTRIBUTING
@@ -0,0 +1,29 @@
+If you would like to contribute, please open a ticket in JIRA:
+
+* http://tickets.opscode.com
+
+Create the ticket in the COOK project and use the cookbook name as the
+component.
+
+For all code contributions, we ask that contributors sign a
+contributor license agreement (CLA). Instructions may be found here:
+
+* http://wiki.opscode.com/display/chef/How+to+Contribute
+
+When contributing changes to individual cookbooks, please do not
+modify the version number in the metadata.rb. Also please do not
+update the CHANGELOG.md for a new version. Not all changes to a
+cookbook may be merged and released in the same versions. Opscode will
+handle the version updates during the release process. You are welcome
+to correct typos or otherwise make updates to documentation in the
+README.
+
+If a contribution adds new platforms or platform versions, indicate
+such in the body of the commit message(s), and update the relevant
+COOK ticket. When writing commit messages, it is helpful for others if
+you indicate the COOK ticket. For example:
+
+    git commit -m '[COOK-1041] Updated pool resource to correctly delete.'
+
+In the ticket itself, it is also helpful if you include log output of
+a successful Chef run, but this is not absolutely required.
diff --git a/chef/cookbooks/apt/Gemfile b/chef/cookbooks/apt/Gemfile
new file mode 100644
index 00000000000..01e60b95cf0
--- /dev/null
+++ b/chef/cookbooks/apt/Gemfile
@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'test-kitchen', '>= 0.7.0'
diff --git a/chef/cookbooks/apt/Gemfile.lock b/chef/cookbooks/apt/Gemfile.lock
new file mode 100644
index 00000000000..07e4652e0b5
--- /dev/null
+++ b/chef/cookbooks/apt/Gemfile.lock
@@ -0,0 +1,132 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    builder (3.1.4)
+    bunny (0.7.9)
+    chef (10.18.2)
+      bunny (>= 0.6.0, < 0.8.0)
+      erubis
+      highline (>= 1.6.9)
+      json (>= 1.4.4, <= 1.6.1)
+      mixlib-authentication (>= 1.3.0)
+      mixlib-cli (>= 1.1.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.3.0)
+      mixlib-shellout
+      moneta (< 0.7.0)
+      net-ssh (~> 2.2.2)
+      net-ssh-multi (~> 1.1.0)
+      ohai (>= 0.6.0)
+      rest-client (>= 1.0.4, < 1.7.0)
+      treetop (~> 1.4.9)
+      uuidtools
+      yajl-ruby (~> 1.1)
+    childprocess (0.3.7)
+      ffi (~> 1.0, >= 1.0.6)
+    coderay (1.0.8)
+    erubis (2.7.0)
+    excon (0.16.10)
+    ffi (1.3.1)
+    fog (1.9.0)
+      builder
+      excon (~> 0.14)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.0.4)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+    foodcritic (1.7.0)
+      erubis
+      gherkin (~> 2.11.1)
+      gist (~> 3.1.0)
+      nokogiri (~> 1.5.4)
+      pry (~> 0.9.8.4)
+      rak (~> 1.4)
+      treetop (~> 1.4.10)
+      yajl-ruby (~> 1.1.0)
+    formatador (0.2.4)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    gist (3.1.1)
+    hashr (0.0.22)
+    highline (1.6.15)
+    i18n (0.6.1)
+    ipaddress (0.8.0)
+    json (1.5.4)
+    librarian (0.0.26)
+      archive-tar-minitar (>= 0.5.2)
+      chef (>= 0.10)
+      highline
+      thor (~> 0.15)
+    log4r (1.1.10)
+    method_source (0.7.1)
+    mime-types (1.19)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-cli (1.2.2)
+    mixlib-config (1.1.2)
+    mixlib-log (1.4.1)
+    mixlib-shellout (1.1.0)
+    moneta (0.6.0)
+    multi_json (1.5.0)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.2.2)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    net-ssh-multi (1.1)
+      net-ssh (>= 2.1.4)
+      net-ssh-gateway (>= 0.99.0)
+    nokogiri (1.5.6)
+    ohai (6.16.0)
+      ipaddress
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      mixlib-shellout
+      systemu
+      yajl-ruby
+    polyglot (0.3.3)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    rak (1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    ruby-hmac (0.4.0)
+    slop (2.4.4)
+    systemu (2.5.2)
+    test-kitchen (0.7.0)
+      fog
+      foodcritic (>= 1.4.0)
+      hashr (~> 0.0.20)
+      highline (>= 1.6.9)
+      librarian (~> 0.0.20)
+      mixlib-cli (~> 1.2.2)
+      vagrant (~> 1.0.2)
+      yajl-ruby (~> 1.1.0)
+    thor (0.16.0)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    uuidtools (2.1.3)
+    vagrant (1.0.6)
+      archive-tar-minitar (= 0.5.2)
+      childprocess (~> 0.3.1)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6.0)
+      json (~> 1.5.1)
+      log4r (~> 1.1.9)
+      net-scp (~> 1.0.4)
+      net-ssh (~> 2.2.2)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  test-kitchen (>= 0.7.0)
diff --git a/chef/cookbooks/apt/LICENSE b/chef/cookbooks/apt/LICENSE
new file mode 100644
index 00000000000..11069edd790
--- /dev/null
+++ b/chef/cookbooks/apt/LICENSE
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/chef/cookbooks/apt/README.md b/chef/cookbooks/apt/README.md
new file mode 100644
index 00000000000..a4c6508d490
--- /dev/null
+++ b/chef/cookbooks/apt/README.md
@@ -0,0 +1,229 @@
+Description
+===========
+
+This cookbook includes recipes to execute apt-get update to ensure the
+local APT package cache is up to date. There are recipes for managing
+the apt-cacher-ng caching proxy and proxy clients. It also includes a
+LWRP for managing APT repositories in /etc/apt/sources.list.d as well as
+an LWRP for pinning packages via /etc/apt/preferences.d.
+
+Requirements
+============
+
+Version 1.8.2+ of this cookbook requires **Chef 10.16.4** or later.
+
+If your Chef version is earlier than 10.16.4, use version 1.7.0 of
+this cookbook.
+
+See [CHEF-3493](http://tickets.opscode.com/browse/CHEF-3493) and
+[this code comment](http://bit.ly/VgvCgf) for more information on this
+requirement.
+
+Platform
+--------
+
+* Debian
+* Ubuntu
+
+May work with or without modification on other Debian derivatives.
+
+Recipes
+=======
+
+default
+-------
+
+This recipe installs the `update-notifier-common` package to provide
+the timestamp file used to only run `apt-get update` if the cache is
+more than one day old.
+
+This recipe should appear first in the run list of Debian or Ubuntu
+nodes to ensure that the package cache is up to date before managing
+any `package` resources with Chef.
+
+This recipe also sets up a local cache directory for preseeding packages.
+
+cacher-ng
+---------
+
+Installs the `apt-cacher-ng` package and service so the system can
+provide APT caching. You can check the usage report at
+http://{hostname}:3142/acng-report.html. The `cacher-ng` recipe
+includes the `cacher-client` recipe, so it helps seed itself.
+
+cacher-client
+-------------
+Configures the node to use the `apt-cacher-ng` server as a client. If you
+want to restrict your node to using the `apt-cacher-ng` server in your
+Environment, set `['apt']['cacher-client']['restrict_environment']` to `true`.
+To use a cacher server (or standard proxy server) not available via search
+set the atttribute `['apt']['cacher-ipaddress']` and for a custom port
+set `['apt']['cacher_port']`
+
+Resources/Providers
+===================
+
+Managing repositories
+---------------------
+
+This LWRP provides an easy way to manage additional APT repositories.
+Adding a new repository will notify running the `execute[apt-get-update]`
+resource immediately.
+
+# Actions
+
+- :add: creates a repository file and builds the repository listing
+- :remove: removes the repository file
+
+# Attribute Parameters
+
+- repo_name: name attribute. The name of the channel to discover
+- uri: the base of the Debian distribution
+- distribution: this is usually your release's codename...ie something
+  like `karmic`, `lucid` or `maverick`
+- components: package groupings..when it doubt use `main`
+- arch: constrain package to a particular arch like `i386`, `amd64` or
+  even `armhf` or `powerpc`. Defaults to nil.
+- deb_src: whether or not to add the repository as a source repo as
+  well - value can be `true` or `false`, default `false`.
+- keyserver: the GPG keyserver where the key for the repo should be retrieved
+- key: if a `keyserver` is provided, this is assumed to be the
+  fingerprint, otherwise it can be either the URI to the GPG key for
+  the repo, or a cookbook_file.
+- cookbook: if key should be a cookbook_file, specify a cookbook where
+  the key is located for files/default. Defaults to nil, so it will
+  use the cookbook where the resource is used.
+
+# Examples
+
+    # add the Zenoss repo
+    apt_repository "zenoss" do
+      uri "http://dev.zenoss.org/deb"
+      components ["main","stable"]
+    end
+
+    # add the Nginx PPA; grab key from keyserver
+    apt_repository "nginx-php" do
+      uri "http://ppa.launchpad.net/nginx/php5/ubuntu"
+      distribution node['lsb']['codename']
+      components ["main"]
+      keyserver "keyserver.ubuntu.com"
+      key "C300EE8C"
+    end
+
+    # add the Nginx PPA; grab key from keyserver, also add source repo
+    apt_repository "nginx-php" do
+      uri "http://ppa.launchpad.net/nginx/php5/ubuntu"
+      distribution node['lsb']['codename']
+      components ["main"]
+      keyserver "keyserver.ubuntu.com"
+      key "C300EE8C"
+      deb_src true
+    end
+
+    # add the Cloudkick Repo
+    apt_repository "cloudkick" do
+      uri "http://packages.cloudkick.com/ubuntu"
+      distribution node['lsb']['codename']
+      components ["main"]
+      key "http://packages.cloudkick.com/cloudkick.packages.key"
+    end
+
+    # add the Cloudkick Repo with the key downloaded in the cookbook
+    apt_repository "cloudkick" do
+      uri "http://packages.cloudkick.com/ubuntu"
+      distribution node['lsb']['codename']
+      components ["main"]
+      key "cloudkick.packages.key"
+    end
+
+    # add the Cloudera Repo of CDH4 packages for Ubuntu 12.04 on AMD64
+    apt_repository "cloudera" do
+      uri "http://archive.cloudera.com/cdh4/ubuntu/precise/amd64/cdh"
+      arch "amd64"
+      distribution "precise-cdh4"
+      components ["contrib"]
+      key "http://archive.cloudera.com/debian/archive.key"
+    end
+
+    # remove Zenoss repo
+    apt_repository "zenoss" do
+      action :remove
+    end
+
+Pinning packages
+----------------
+
+This LWRP provides an easy way to pin packages in /etc/apt/preferences.d.
+Although apt-pinning is quite helpful from time to time please note that Debian
+does not encourage its use without thorough consideration.
+
+Further information regarding apt-pinning is available via
+http://wiki.debian.org/AptPreferences.
+
+# Actions
+
+- :add: creates a preferences file under /etc/apt/preferences.d
+- :remove: Removes the file, therefore unpin the package
+
+# Attribute Parameters
+
+- package_name: name attribute. The name of the package
+- pin: The package version/repository to pin
+- pin_priority: The pinning priority aka "the highest package version wins"
+
+# Examples
+
+    # Pin libmysqlclient16 to version 5.1.49-3
+    apt_preference "libmysqlclient16" do
+      pin "version 5.1.49-3"
+      pin_priority "700"
+    end
+
+    # Unpin libmysqlclient16
+    apt_preference "libmysqlclient16" do
+      action :remove
+    end
+
+Usage
+=====
+
+Put `recipe[apt]` first in the run list. If you have other recipes
+that you want to use to configure how apt behaves, like new sources,
+notify the execute resource to run, e.g.:
+
+    template "/etc/apt/sources.list.d/my_apt_sources.list" do
+      notifies :run, resources(:execute => "apt-get update"), :immediately
+    end
+
+The above will run during execution phase since it is a normal
+template resource, and should appear before other package resources
+that need the sources in the template.
+
+Put `recipe[apt::cacher-ng]` in the run_list for a server to provide
+APT caching and add `recipe[apt::cacher-client]` on the rest of the
+Debian-based nodes to take advantage of the caching server.
+
+If you want to cleanup unused packages, there is also the `apt-get autoclean`
+and `apt-get autoremove` resources provided for automated cleanup.
+
+License and Author
+==================
+
+Author:: Joshua Timberman (<joshua@opscode.com>)
+Author:: Matt Ray (<matt@opscode.com>)
+Author:: Seth Chisamore (<schisamo@opscode.com>)
+
+Copyright 2009-2012 Opscode, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/chef/cookbooks/apt/attributes/default.rb b/chef/cookbooks/apt/attributes/default.rb
new file mode 100644
index 00000000000..1f4ab34a069
--- /dev/null
+++ b/chef/cookbooks/apt/attributes/default.rb
@@ -0,0 +1,2 @@
+default['apt']['cacher-client']['restrict_environment'] = false
+default['apt']['cacher_port'] = 3142
diff --git a/chef/cookbooks/apt/files/default/apt-proxy-v2.conf b/chef/cookbooks/apt/files/default/apt-proxy-v2.conf
new file mode 100644
index 00000000000..6541f25ed05
--- /dev/null
+++ b/chef/cookbooks/apt/files/default/apt-proxy-v2.conf
@@ -0,0 +1,50 @@
+[DEFAULT]
+;; All times are in seconds, but you can add a suffix
+;; for minutes(m), hours(h) or days(d)
+
+;; commented out address so apt-proxy will listen on all IPs
+;; address = 127.0.0.1
+port = 9999
+cache_dir = /var/cache/apt-proxy
+
+;; Control files (Packages/Sources/Contents) refresh rate
+min_refresh_delay = 1s
+complete_clientless_downloads = 1
+
+;; Debugging settings.
+debug = all:4 db:0
+
+time = 30
+passive_ftp = on
+
+;;--------------------------------------------------------------
+;; Cache housekeeping
+
+cleanup_freq = 1d
+max_age = 120d
+max_versions = 3
+
+;;---------------------------------------------------------------
+;; Backend servers
+;;
+;; Place each server in its own [section]
+
+[ubuntu]
+; Ubuntu archive
+backends =
+        http://us.archive.ubuntu.com/ubuntu
+
+[ubuntu-security]
+; Ubuntu security updates
+backends = http://security.ubuntu.com/ubuntu
+
+[debian]
+;; Backend servers, in order of preference
+backends = 
+        http://debian.osuosl.org/debian/
+
+[security]
+;; Debian security archive
+backends = 
+        http://security.debian.org/debian-security
+        http://ftp2.de.debian.org/debian-security
diff --git a/chef/cookbooks/apt/metadata.json b/chef/cookbooks/apt/metadata.json
new file mode 100644
index 00000000000..6c7b005bfe0
--- /dev/null
+++ b/chef/cookbooks/apt/metadata.json
@@ -0,0 +1,34 @@
+{
+  "name": "apt",
+  "description": "Configures apt and apt services and LWRPs for managing apt repositories and preferences",
+  "long_description": "Description\n===========\n\nThis cookbook includes recipes to execute apt-get update to ensure the\nlocal APT package cache is up to date. There are recipes for managing\nthe apt-cacher-ng caching proxy and proxy clients. It also includes a\nLWRP for managing APT repositories in /etc/apt/sources.list.d as well as\nan LWRP for pinning packages via /etc/apt/preferences.d.\n\nRequirements\n============\n\nVersion 1.8.2+ of this cookbook requires **Chef 10.16.4** or later.\n\nIf your Chef version is earlier than 10.16.4, use version 1.7.0 of\nthis cookbook.\n\nSee [CHEF-3493](http://tickets.opscode.com/browse/CHEF-3493) and\n[this code comment](http://bit.ly/VgvCgf) for more information on this\nrequirement.\n\nPlatform\n--------\n\n* Debian\n* Ubuntu\n\nMay work with or without modification on other Debian derivatives.\n\nRecipes\n=======\n\ndefault\n-------\n\nThis recipe installs the `update-notifier-common` package to provide\nthe timestamp file used to only run `apt-get update` if the cache is\nmore than one day old.\n\nThis recipe should appear first in the run list of Debian or Ubuntu\nnodes to ensure that the package cache is up to date before managing\nany `package` resources with Chef.\n\nThis recipe also sets up a local cache directory for preseeding packages.\n\ncacher-ng\n---------\n\nInstalls the `apt-cacher-ng` package and service so the system can\nprovide APT caching. You can check the usage report at\nhttp://{hostname}:3142/acng-report.html. The `cacher-ng` recipe\nincludes the `cacher-client` recipe, so it helps seed itself.\n\ncacher-client\n-------------\nConfigures the node to use the `apt-cacher-ng` server as a client. If you\nwant to restrict your node to using the `apt-cacher-ng` server in your\nEnvironment, set `['apt']['cacher-client']['restrict_environment']` to `true`.\nTo use a cacher server (or standard proxy server) not available via search\nset the atttribute `['apt']['cacher-ipaddress']` and for a custom port\nset `['apt']['cacher_port']`\n\nResources/Providers\n===================\n\nManaging repositories\n---------------------\n\nThis LWRP provides an easy way to manage additional APT repositories.\nAdding a new repository will notify running the `execute[apt-get-update]`\nresource immediately.\n\n# Actions\n\n- :add: creates a repository file and builds the repository listing\n- :remove: removes the repository file\n\n# Attribute Parameters\n\n- repo_name: name attribute. The name of the channel to discover\n- uri: the base of the Debian distribution\n- distribution: this is usually your release's codename...ie something\n  like `karmic`, `lucid` or `maverick`\n- components: package groupings..when it doubt use `main`\n- arch: constrain package to a particular arch like `i386`, `amd64` or\n  even `armhf` or `powerpc`. Defaults to nil.\n- deb_src: whether or not to add the repository as a source repo as\n  well - value can be `true` or `false`, default `false`.\n- keyserver: the GPG keyserver where the key for the repo should be retrieved\n- key: if a `keyserver` is provided, this is assumed to be the\n  fingerprint, otherwise it can be either the URI to the GPG key for\n  the repo, or a cookbook_file.\n- cookbook: if key should be a cookbook_file, specify a cookbook where\n  the key is located for files/default. Defaults to nil, so it will\n  use the cookbook where the resource is used.\n\n# Examples\n\n    # add the Zenoss repo\n    apt_repository \"zenoss\" do\n      uri \"http://dev.zenoss.org/deb\"\n      components [\"main\",\"stable\"]\n    end\n\n    # add the Nginx PPA; grab key from keyserver\n    apt_repository \"nginx-php\" do\n      uri \"http://ppa.launchpad.net/nginx/php5/ubuntu\"\n      distribution node['lsb']['codename']\n      components [\"main\"]\n      keyserver \"keyserver.ubuntu.com\"\n      key \"C300EE8C\"\n    end\n\n    # add the Nginx PPA; grab key from keyserver, also add source repo\n    apt_repository \"nginx-php\" do\n      uri \"http://ppa.launchpad.net/nginx/php5/ubuntu\"\n      distribution node['lsb']['codename']\n      components [\"main\"]\n      keyserver \"keyserver.ubuntu.com\"\n      key \"C300EE8C\"\n      deb_src true\n    end\n\n    # add the Cloudkick Repo\n    apt_repository \"cloudkick\" do\n      uri \"http://packages.cloudkick.com/ubuntu\"\n      distribution node['lsb']['codename']\n      components [\"main\"]\n      key \"http://packages.cloudkick.com/cloudkick.packages.key\"\n    end\n\n    # add the Cloudkick Repo with the key downloaded in the cookbook\n    apt_repository \"cloudkick\" do\n      uri \"http://packages.cloudkick.com/ubuntu\"\n      distribution node['lsb']['codename']\n      components [\"main\"]\n      key \"cloudkick.packages.key\"\n    end\n\n    # add the Cloudera Repo of CDH4 packages for Ubuntu 12.04 on AMD64\n    apt_repository \"cloudera\" do\n      uri \"http://archive.cloudera.com/cdh4/ubuntu/precise/amd64/cdh\"\n      arch \"amd64\"\n      distribution \"precise-cdh4\"\n      components [\"contrib\"]\n      key \"http://archive.cloudera.com/debian/archive.key\"\n    end\n\n    # remove Zenoss repo\n    apt_repository \"zenoss\" do\n      action :remove\n    end\n\nPinning packages\n----------------\n\nThis LWRP provides an easy way to pin packages in /etc/apt/preferences.d.\nAlthough apt-pinning is quite helpful from time to time please note that Debian\ndoes not encourage its use without thorough consideration.\n\nFurther information regarding apt-pinning is available via\nhttp://wiki.debian.org/AptPreferences.\n\n# Actions\n\n- :add: creates a preferences file under /etc/apt/preferences.d\n- :remove: Removes the file, therefore unpin the package\n\n# Attribute Parameters\n\n- package_name: name attribute. The name of the package\n- pin: The package version/repository to pin\n- pin_priority: The pinning priority aka \"the highest package version wins\"\n\n# Examples\n\n    # Pin libmysqlclient16 to version 5.1.49-3\n    apt_preference \"libmysqlclient16\" do\n      pin \"version 5.1.49-3\"\n      pin_priority \"700\"\n    end\n\n    # Unpin libmysqlclient16\n    apt_preference \"libmysqlclient16\" do\n      action :remove\n    end\n\nUsage\n=====\n\nPut `recipe[apt]` first in the run list. If you have other recipes\nthat you want to use to configure how apt behaves, like new sources,\nnotify the execute resource to run, e.g.:\n\n    template \"/etc/apt/sources.list.d/my_apt_sources.list\" do\n      notifies :run, resources(:execute => \"apt-get update\"), :immediately\n    end\n\nThe above will run during execution phase since it is a normal\ntemplate resource, and should appear before other package resources\nthat need the sources in the template.\n\nPut `recipe[apt::cacher-ng]` in the run_list for a server to provide\nAPT caching and add `recipe[apt::cacher-client]` on the rest of the\nDebian-based nodes to take advantage of the caching server.\n\nIf you want to cleanup unused packages, there is also the `apt-get autoclean`\nand `apt-get autoremove` resources provided for automated cleanup.\n\nLicense and Author\n==================\n\nAuthor:: Joshua Timberman (<joshua@opscode.com>)\nAuthor:: Matt Ray (<matt@opscode.com>)\nAuthor:: Seth Chisamore (<schisamo@opscode.com>)\n\nCopyright 2009-2012 Opscode, Inc.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
+  "maintainer": "Opscode, Inc.",
+  "maintainer_email": "cookbooks@opscode.com",
+  "license": "Apache 2.0",
+  "platforms": {
+    "ubuntu": ">= 0.0.0",
+    "debian": ">= 0.0.0"
+  },
+  "dependencies": {
+  },
+  "recommendations": {
+  },
+  "suggestions": {
+  },
+  "conflicting": {
+  },
+  "providing": {
+  },
+  "replacing": {
+  },
+  "attributes": {
+  },
+  "groupings": {
+  },
+  "recipes": {
+    "apt": "Runs apt-get update during compile phase and sets up preseed directories",
+    "apt::cacher-ng": "Set up an apt-cacher-ng caching proxy",
+    "apt::cacher-client": "Client for the apt::cacher-ng caching proxy"
+  },
+  "version": "1.8.4"
+}
\ No newline at end of file
diff --git a/chef/cookbooks/apt/metadata.rb b/chef/cookbooks/apt/metadata.rb
new file mode 100644
index 00000000000..27f7d930288
--- /dev/null
+++ b/chef/cookbooks/apt/metadata.rb
@@ -0,0 +1,14 @@
+name              "apt"
+maintainer        "Opscode, Inc."
+maintainer_email  "cookbooks@opscode.com"
+license           "Apache 2.0"
+description       "Configures apt and apt services and LWRPs for managing apt repositories and preferences"
+long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version           "1.8.4"
+recipe            "apt", "Runs apt-get update during compile phase and sets up preseed directories"
+recipe            "apt::cacher-ng", "Set up an apt-cacher-ng caching proxy"
+recipe            "apt::cacher-client", "Client for the apt::cacher-ng caching proxy"
+
+%w{ ubuntu debian }.each do |os|
+  supports os
+end
diff --git a/chef/cookbooks/apt/providers/preference.rb b/chef/cookbooks/apt/providers/preference.rb
new file mode 100644
index 00000000000..abfb440e8df
--- /dev/null
+++ b/chef/cookbooks/apt/providers/preference.rb
@@ -0,0 +1,61 @@
+#
+# Cookbook Name:: apt
+# Provider:: preference
+#
+# Copyright 2010-2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Build preferences.d file contents
+def build_pref(package_name, pin, pin_priority)
+  preference_content = "Package: #{package_name}\nPin: #{pin}\nPin-Priority: #{pin_priority}\n"
+end
+
+action :add do
+  new_resource.updated_by_last_action(false)
+
+  preference = build_pref(new_resource.package_name,
+                          new_resource.pin,
+                          new_resource.pin_priority)
+
+  preference_dir = directory "/etc/apt/preferences.d" do
+    owner "root"
+    group "root"
+    mode 00755
+    recursive true
+    action :nothing
+  end
+
+  preference_file = file "/etc/apt/preferences.d/#{new_resource.name}" do
+    owner "root"
+    group "root"
+    mode 00644
+    content preference
+    action :nothing
+  end
+
+  preference_dir.run_action(:create)
+  # write out the preference file, replace it if it already exists
+  preference_file.run_action(:create)
+end
+
+action :remove do
+  if ::File.exists?("/etc/apt/preferences.d/#{new_resource.name}")
+    Chef::Log.info "Un-pinning #{new_resource.name} from /etc/apt/preferences.d/"
+    file "/etc/apt/preferences.d/#{new_resource.name}" do
+      action :delete
+    end
+    new_resource.updated_by_last_action(true)
+  end
+end
diff --git a/chef/cookbooks/apt/providers/repository.rb b/chef/cookbooks/apt/providers/repository.rb
new file mode 100644
index 00000000000..da7e4f258da
--- /dev/null
+++ b/chef/cookbooks/apt/providers/repository.rb
@@ -0,0 +1,134 @@
+#
+# Cookbook Name:: apt
+# Provider:: repository
+#
+# Copyright 2010-2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+def whyrun_supported?
+  true
+end
+
+# install apt key from keyserver
+def install_key_from_keyserver(key, keyserver)
+  execute "install-key #{key}" do
+    command "apt-key adv --keyserver #{keyserver} --recv #{key}"
+    action :run
+    not_if "apt-key list | grep #{key}"
+  end
+end
+
+# run command and extract gpg ids
+def extract_gpg_ids_from_cmd(cmd)
+  so = Mixlib::ShellOut.new(cmd)
+  so.run_command
+  so.stdout.split(/\n/).collect do |t|
+    if z = t.match(/^pub\s+\d+\w\/([0-9A-F]{8})/)
+      z[1]
+    end
+  end.compact
+end
+
+# install apt key from URI
+def install_key_from_uri(uri)
+  key_name = uri.split(/\//).last
+  cached_keyfile = "#{Chef::Config[:file_cache_path]}/#{key_name}"
+  if new_resource.key =~ /http/
+    remote_file cached_keyfile do
+      source new_resource.key
+      mode 00644
+      action :create
+    end
+  else
+    cookbook_file cached_keyfile do
+      source new_resource.key
+      cookbook new_resource.cookbook
+      mode 00644
+      action :create
+    end
+  end
+
+  execute "install-key #{key_name}" do
+    command "apt-key add #{cached_keyfile}"
+    action :run
+    not_if do
+      installed_ids = extract_gpg_ids_from_cmd("apt-key finger")
+      key_ids = extract_gpg_ids_from_cmd("gpg --with-fingerprint #{cached_keyfile}")
+      (installed_ids & key_ids).sort == key_ids.sort
+    end
+  end
+end
+
+# build repo file contents
+def build_repo(uri, distribution, components, arch, add_deb_src)
+  components = components.join(' ') if components.respond_to?(:join)
+  repo_info = "#{uri} #{distribution} #{components}\n"
+  repo_info = "[arch=#{arch}] #{repo_info}" if arch
+  repo =  "deb     #{repo_info}"
+  repo << "deb-src #{repo_info}" if add_deb_src
+  repo
+end
+
+action :add do
+  new_resource.updated_by_last_action(false)
+  @repo_file = nil
+
+  recipe_eval do
+    # add key
+    if new_resource.keyserver && new_resource.key
+      install_key_from_keyserver(new_resource.key, new_resource.keyserver)
+    elsif new_resource.key
+      install_key_from_uri(new_resource.key)
+    end
+
+    file "/var/lib/apt/periodic/update-success-stamp" do
+      action :nothing
+    end
+
+    execute "apt-get update" do
+      ignore_failure true
+      action :nothing
+    end
+
+    # build repo file
+    repository = build_repo(new_resource.uri,
+                            new_resource.distribution,
+                            new_resource.components,
+                            new_resource.arch,
+                            new_resource.deb_src)
+
+    @repo_file = file "/etc/apt/sources.list.d/#{new_resource.name}.list" do
+      owner "root"
+      group "root"
+      mode 00644
+      content repository
+      action :create
+      notifies :delete, "file[/var/lib/apt/periodic/update-success-stamp]", :immediately
+      notifies :run, "execute[apt-get update]", :immediately if new_resource.cache_rebuild
+    end
+  end
+
+  raise RuntimeError, "The repository file to create is nil, cannot continue." if @repo_file.nil?
+  new_resource.updated_by_last_action(@repo_file.updated?)
+end
+
+action :remove do
+  if ::File.exists?("/etc/apt/sources.list.d/#{new_resource.name}.list")
+    Chef::Log.info "Removing #{new_resource.name} repository from /etc/apt/sources.list.d/"
+    file "/etc/apt/sources.list.d/#{new_resource.name}.list" do
+      action :delete
+    end
+  end
+end
diff --git a/chef/cookbooks/apt/recipes/cacher-client.rb b/chef/cookbooks/apt/recipes/cacher-client.rb
new file mode 100644
index 00000000000..35f1bdfe334
--- /dev/null
+++ b/chef/cookbooks/apt/recipes/cacher-client.rb
@@ -0,0 +1,59 @@
+#
+# Cookbook Name:: apt
+# Recipe:: cacher-client
+#
+# Copyright 2011, 2012 Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#remove Acquire::http::Proxy lines from /etc/apt/apt.conf since we use 01proxy
+#these are leftover from preseed installs
+execute 'Remove proxy from /etc/apt/apt.conf' do
+  command "sed --in-place '/^Acquire::http::Proxy/d' /etc/apt/apt.conf"
+  only_if "grep Acquire::http::Proxy /etc/apt/apt.conf"
+end
+
+servers = []
+if node['apt'] && node['apt']['cacher_ipaddress']
+  cacher = Chef::Node.new
+  cacher.name(node['apt']['cacher_ipaddress'])
+  cacher.ipaddress(node['apt']['cacher_ipaddress'])
+  servers << cacher
+end
+
+unless Chef::Config[:solo]
+  query = 'recipes:apt\:\:cacher-ng'
+  query += " AND chef_environment:#{node.chef_environment}" if node['apt']['cacher-client']['restrict_environment']
+  Chef::Log.debug("apt::cacher-client searching for '#{query}'")
+  servers += search(:node, query)
+end
+
+if servers.length > 0
+  Chef::Log.info("apt-cacher-ng server found on #{servers[0]}.")
+  template '/etc/apt/apt.conf.d/01proxy' do
+    source '01proxy.erb'
+    owner 'root'
+    group 'root'
+    mode 00644
+    variables(
+      :proxy => servers[0]['ipaddress'],
+      :port => node['apt']['cacher_port']
+      )
+  end.run_action(:create)
+else
+  Chef::Log.info('No apt-cacher-ng server found.')
+  file '/etc/apt/apt.conf.d/01proxy' do
+    action :delete
+  end
+end
diff --git a/chef/cookbooks/apt/recipes/cacher-ng.rb b/chef/cookbooks/apt/recipes/cacher-ng.rb
new file mode 100644
index 00000000000..9b986971ce6
--- /dev/null
+++ b/chef/cookbooks/apt/recipes/cacher-ng.rb
@@ -0,0 +1,43 @@
+#
+# Cookbook Name:: apt
+# Recipe:: cacher-ng
+#
+# Copyright 2008-2012, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package "apt-cacher-ng" do
+  action :install
+end
+
+service "apt-cacher-ng" do
+  supports :restart => true, :status => false
+  action :enable
+end
+
+template "/etc/apt-cacher-ng/acng.conf" do
+  source "acng.conf.erb"
+  owner "root"
+  group "root"
+  mode 00644
+  notifies :restart, "service[apt-cacher-ng]"
+end
+
+# Reopen resource w/ start in case config issue causes startup to fail
+service "apt-cacher-ng" do
+  action :start
+end
+
+#this will help seed the proxy
+include_recipe "apt::cacher-client"
diff --git a/chef/cookbooks/apt/recipes/default.rb b/chef/cookbooks/apt/recipes/default.rb
new file mode 100644
index 00000000000..00dd40a9451
--- /dev/null
+++ b/chef/cookbooks/apt/recipes/default.rb
@@ -0,0 +1,68 @@
+#
+# Cookbook Name:: apt
+# Recipe:: default
+#
+# Copyright 2008-2011, Opscode, Inc.
+# Copyright 2009, Bryan McLellan <btm@loftninjas.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Run apt-get update to create the stamp file
+execute "apt-get-update" do
+  command "apt-get update"
+  ignore_failure true
+  not_if do ::File.exists?('/var/lib/apt/periodic/update-success-stamp') end
+end
+
+# For other recipes to call to force an update
+execute "apt-get update" do
+  command "apt-get update"
+  ignore_failure true
+  action :nothing
+end
+
+# Automatically remove packages that are no longer needed for dependencies
+execute "apt-get autoremove" do
+  command "apt-get -y autoremove"
+  action :nothing
+end
+
+# Automatically remove .deb files for packages no longer on your system
+execute "apt-get autoclean" do
+  command "apt-get -y autoclean"
+  action :nothing
+end
+
+# provides /var/lib/apt/periodic/update-success-stamp on apt-get update
+package "update-notifier-common" do
+  notifies :run, resources(:execute => "apt-get-update"), :immediately
+end
+
+execute "apt-get-update-periodic" do
+  command "apt-get update"
+  ignore_failure true
+  only_if do
+    ::File.exists?('/var/lib/apt/periodic/update-success-stamp') &&
+    ::File.mtime('/var/lib/apt/periodic/update-success-stamp') < Time.now - 86400
+  end
+end
+
+%w{/var/cache/local /var/cache/local/preseeding}.each do |dirname|
+  directory dirname do
+    owner "root"
+    group "root"
+    mode  00755
+    action :create
+  end
+end
diff --git a/chef/cookbooks/apt/resources/preference.rb b/chef/cookbooks/apt/resources/preference.rb
new file mode 100644
index 00000000000..89558e85066
--- /dev/null
+++ b/chef/cookbooks/apt/resources/preference.rb
@@ -0,0 +1,29 @@
+#
+# Cookbook Name:: apt
+# Resource:: preference
+#
+# Copyright 2010-2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+actions :add, :remove
+
+def initialize(*args)
+  super
+  @action = :add
+end
+
+attribute :package_name, :kind_of => String, :name_attribute => true
+attribute :pin, :kind_of => String
+attribute :pin_priority, :kind_of => String
diff --git a/chef/cookbooks/apt/resources/repository.rb b/chef/cookbooks/apt/resources/repository.rb
new file mode 100644
index 00000000000..7515da41253
--- /dev/null
+++ b/chef/cookbooks/apt/resources/repository.rb
@@ -0,0 +1,40 @@
+#
+# Cookbook Name:: apt
+# Resource:: repository
+#
+# Copyright 2010-2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+actions :add, :remove
+
+def initialize(*args)
+  super
+  @action = :add
+end
+
+#name of the repo, used for source.list filename
+attribute :repo_name, :kind_of => String, :name_attribute => true
+attribute :uri, :kind_of => String
+attribute :distribution, :kind_of => String
+attribute :components, :kind_of => Array, :default => []
+attribute :arch, :kind_of => String, :default => nil
+#whether or not to add the repository as a source repo as well
+attribute :deb_src, :default => false
+attribute :keyserver, :kind_of => String, :default => nil
+attribute :key, :kind_of => String, :default => nil
+attribute :cookbook, :kind_of => String, :default => nil
+#trigger cache rebuild
+#If not you can trigger in the recipe itself after checking the status of resource.updated{_by_last_action}?
+attribute :cache_rebuild, :kind_of => [TrueClass, FalseClass], :default => true
diff --git a/chef/cookbooks/apt/templates/default/01proxy.erb b/chef/cookbooks/apt/templates/default/01proxy.erb
new file mode 100644
index 00000000000..eea71c230b6
--- /dev/null
+++ b/chef/cookbooks/apt/templates/default/01proxy.erb
@@ -0,0 +1,2 @@
+Acquire::http::Proxy "http://<%= @proxy %>:<%= @port %>";
+Acquire::https::Proxy "DIRECT";
diff --git a/chef/cookbooks/apt/templates/default/acng.conf.erb b/chef/cookbooks/apt/templates/default/acng.conf.erb
new file mode 100644
index 00000000000..869fdfd4ee5
--- /dev/null
+++ b/chef/cookbooks/apt/templates/default/acng.conf.erb
@@ -0,0 +1,276 @@
+
+# Letter case in directive names does not matter. Must be separated with colons.
+# Valid boolean values are a zero number for false, non-zero numbers for true.
+
+CacheDir: /var/cache/apt-cacher-ng
+
+# set empty to disable logging
+LogDir: /var/log/apt-cacher-ng
+
+# place to look for additional configuration and resource files if they are not
+# found in the configuration directory
+# SupportDir: /usr/lib/apt-cacher-ng
+
+# TCP (http) port
+# Set to 9999 to emulate apt-proxy
+Port:<%= node['apt']['cacher_port'] %>
+
+# Addresses or hostnames to listen on. Multiple addresses must be separated by
+# spaces. Each entry must be an exact local address which is associated with a
+# local interface. DNS resolution is performed using getaddrinfo(3) for all
+# available protocols (IPv4, IPv6, ...). Using a protocol specific format will
+# create binding(s) only on protocol specific socket(s) (e.g. 0.0.0.0 will listen
+# only to IPv4).
+#
+# Default: not set, will listen on all interfaces and protocols
+#
+# BindAddress: localhost 192.168.7.254 publicNameOnMainInterface
+
+# The specification of another proxy which shall be used for downloads.
+# Username and password are, and see manual for limitations.
+#
+#Proxy: http://www-proxy.example.net:80
+#proxy: username:proxypassword@proxy.example.net:3128
+
+# Repository remapping. See manual for details.
+# In this example, some backends files might be generated during package
+# installation using information collected on the system.
+Remap-debrep: file:deb_mirror*.gz /debian ; file:backends_debian # Debian Archives
+Remap-uburep: file:ubuntu_mirrors /ubuntu ; file:backends_ubuntu # Ubuntu Archives
+Remap-debvol: file:debvol_mirror*.gz /debian-volatile ; file:backends_debvol # Debian Volatile Archives
+Remap-cygwin: file:cygwin_mirrors /cygwin # ; file:backends_cygwin # incomplete, please create this file or specify preferred mirrors here
+Remap-sfnet:  file:sfnet_mirrors # ; file:backends_sfnet # incomplete, please create this file or specify preferred mirrors here
+Remap-alxrep: file:archlx_mirrors /archlinux # ; file:backend_archlx # Arch Linux
+Remap-fedora:  file:fedora_mirrors # Fedora Linux
+Remap-epel:   file:epel_mirrors # Fedora EPEL
+Remap-slrep:  file:sl_mirrors # Scientific Linux
+
+# This is usually not needed for security.debian.org because it's always the
+# same DNS hostname. However, it might be enabled in order to use hooks,
+# ForceManaged mode or special flags in this context.
+# Remap-secdeb: security.debian.org
+
+# Virtual page accessible in a web browser to see statistics and status
+# information, i.e. under http://localhost:3142/acng-report.html
+ReportPage: acng-report.html
+
+# Socket file for accessing through local UNIX socket instead of TCP/IP. Can be
+# used with inetd bridge or cron client.
+# SocketPath:/var/run/apt-cacher-ng/socket
+
+# Forces log file to be written to disk after every line when set to 1. Default
+# is 0, buffers are flushed when the client disconnects.
+#
+# (technically, alias to the Debug option, see its documentation for details)
+#
+# UnbufferLogs: 0
+
+# Set to 0 to store only type, time and transfer sizes.
+# 1 -> client IP and relative local path are logged too
+# VerboseLog: 1
+
+# Don't detach from the console
+# ForeGround: 0
+
+# Store the pid of the daemon process therein
+# PidFile: /var/run/apt-cacher-ng/pid
+
+# Forbid outgoing connections, work around them or respond with 503 error
+# offlinemode:0
+
+# Forbid all downloads that don't run through preconfigured backends (.where)
+#ForceManaged: 0
+
+# Days before considering an unreferenced file expired (to be deleted).
+# Warning: if the value is set too low and particular index files are not
+# available for some days (mirror downtime) there is a risk of deletion of
+# still useful package files.
+ExTreshold: 4
+
+# Stop expiration when a critical problem appeared. Currently only failed
+# refresh of an index file is considered as critical.
+#
+# WARNING: don't touch this option or set to zero.
+# Anything else is DANGEROUS and may cause data loss.
+#
+# ExAbortOnProblems: 1
+
+# Replace some Windows/DOS-FS incompatible chars when storing
+# StupidFs: 0
+
+# Experimental feature for apt-listbugs: pass-through SOAP requests and
+# responses to/from bugs.debian.org. If not set, default is true if
+# ForceManaged is enabled and false otherwise.
+# ForwardBtsSoap: 1 
+
+# The daemon has a small cache for DNS data, to speed up resolution. The
+# expiration time of the DNS entries can be configured in seconds.
+# DnsCacheSeconds: 3600
+
+# Don't touch the following values without good consideration! 
+#
+# Max. count of connection threads kept ready (for faster response in the
+# future). Should be a sane value between 0 and average number of connections,
+# and depend on the amount of spare RAM.
+# MaxStandbyConThreads: 8
+#
+# Hard limit of active thread count for incoming connections, i.e. operation
+# is refused when this value is reached (below zero = unlimited).
+# MaxConThreads: -1
+#
+# Pigeonholing files with regular expressions (static/volatile). Can be
+# overriden here but not should not be done permanently because future update
+# of default settings would not be applied later.
+# VfilePattern = (^|.*?/)(Index|Packages(\.gz|\.bz2|\.lzma|\.xz)?|InRelease|Release|Release\.gpg|Sources(\.gz|\.bz2|\.lzma|\.xz)?|release|index\.db-.*\.gz|Contents-[^/]*(\.gz|\.bz2|\.lzma|\.xz)?|pkglist[^/]*\.bz2|rclist[^/]*\.bz2|/meta-release[^/]*|Translation[^/]*(\.gz|\.bz2|\.lzma|\.xz)?|MD5SUMS|SHA1SUMS|((setup|setup-legacy)(\.ini|\.bz2|\.hint)(\.sig)?)|mirrors\.lst|repo(index|md)\.xml(\.asc|\.key)?|directory\.yast|products|content(\.asc|\.key)?|media|filelists\.xml\.gz|filelists\.sqlite\.bz2|repomd\.xml|packages\.[a-zA-Z][a-zA-Z]\.gz|info\.txt|license\.tar\.gz|license\.zip|.*\.db(\.tar\.gz)?|.*\.files\.tar\.gz|.*\.abs\.tar\.gz|metalink\?repo|.*prestodelta\.xml\.gz)$|/dists/.*/installer-[^/]+/[^0-9][^/]+/images/.*
+# PfilePattern = .*(\.d?deb|\.rpm|\.dsc|\.tar(\.gz|\.bz2|\.lzma|\.xz)(\.gpg)?|\.diff(\.gz|\.bz2|\.lzma|\.xz)|\.jigdo|\.template|changelog|copyright|\.udeb|\.debdelta|\.diff/.*\.gz|(Devel)?ReleaseAnnouncement(\?.*)?|[a-f0-9]+-(susedata|updateinfo|primary|deltainfo).xml.gz|fonts/(final/)?[a-z]+32.exe(\?download.*)?|/dists/.*/installer-[^/]+/[0-9][^/]+/images/.*)$
+# Whitelist for expiration, file types not to be removed even when being
+# unreferenced. Default: many parts from VfilePattern where no parent index
+# exists or might be unknown.
+# WfilePattern = (^|.*?/)(Release|InRelease|Release\.gpg|(Packages|Sources)(\.gz|\.bz2|\.lzma|\.xz)?|Translation[^/]*(\.gz|\.bz2|\.lzma|\.xz)?|MD5SUMS|SHA1SUMS|.*\.xml|.*\.db\.tar\.gz|.*\.files\.tar\.gz|.*\.abs\.tar\.gz|[a-z]+32.exe)$|/dists/.*/installer-.*/images/.*
+
+# Higher modes only working with the debug version
+# Warning, writes a lot into apt-cacher.err logfile
+# Value overwrites UnbufferLogs setting (aliased)
+# Debug:3
+
+# Usually, general purpose proxies like Squid expose the IP address of the
+# client user to the remote server using the X-Forwarded-For HTTP header. This
+# behaviour can be optionally turned on with the Expose-Origin option.
+# ExposeOrigin: 0
+
+# When logging the originating IP address, trust the information supplied by
+# the client in the X-Forwarded-For header.
+# LogSubmittedOrigin: 0
+
+# The version string reported to the peer, to be displayed as HTTP client (and
+# version) in the logs of the mirror.
+# WARNING: some archives use this header to detect/guess capabilities of the
+# client (i.e. redirection support) and change the behaviour accordingly, while
+# ACNG might not support the expected features. Expect side effects.
+#
+# UserAgent: Yet Another HTTP Client/1.2.3p4
+
+# In some cases the Import and Expiration tasks might create fresh volatile
+# data for internal use by reconstructing them using patch files. This
+# by-product might be recompressed with bzip2 and with some luck the resulting
+# file becomes identical to the *.bz2 file on the server, usable for APT
+# clients trying to fetch the full .bz2 compressed version. Injection of the
+# generated files into the cache has however a disadvantage on underpowered
+# servers: bzip2 compression can create high load on the server system and the
+# visible download of the busy .bz2 files also becomes slower.
+#
+# RecompBz2: 0
+
+# Network timeout for outgoing connections.
+# NetworkTimeout: 60
+
+# Sometimes it makes sense to not store the data in cache and just return the
+# package data to client as it comes in. DontCache parameters can enable this
+# behaviour for certain URL types. The tokens are extended regular expressions
+# that URLs are matched against.
+#
+# DontCacheRequested is applied to the URL as it comes in from the client.
+# Example: exclude packages built with kernel-package for x86
+# DontCacheRequested: linux-.*_10\...\.Custo._i386
+# Example usecase: exclude popular private IP ranges from caching
+# DontCacheRequested: 192.168.0 ^10\..* 172.30
+#
+# DontCacheResolved is applied to URLs after mapping to the target server. If
+# multiple backend servers are specified then it's only matched against the
+# download link for the FIRST possible source (due to implementation limits).
+# Example usecase: all Ubuntu stuff comes from a local mirror (specified as
+# backend), don't cache it again:
+# DontCacheResolved: ubuntumirror.local.net
+#
+# DontCache directive sets (overrides) both, DontCacheResolved and
+# DontCacheRequested.  Provided for convenience, see those directives for
+# details.
+#
+# Default permission set of freshly created files and directories, as octal
+# numbers (see chmod(1) for details).
+# Can by limited by the umask value (see umask(2) for details) if it's set in
+# the environment of the starting shell, e.g. in apt-cacher-ng init script or
+# in its configuration file.
+# DirPerms: 00755
+# FilePerms: 00664
+#
+#
+# It's possible to use use apt-cacher-ng as a regular web server with limited
+# feature set, i.e. 
+# including directory browsing and download of any file;
+# excluding sorting, mime types/encodings, CGI execution, index page
+# redirection and other funny things.
+# To get this behavior, mappings between virtual directories and real
+# directories on the server must be defined with the LocalDirs directive.
+# Virtual and real dirs are separated by spaces, multiple pairs are separated
+# by semi-colons. Real directories must be absolute paths.
+# NOTE: Since the names of that key directories share the same namespace as
+# repository names (see Remap-...) it's administrators job to avoid such
+# collisions on them (unless created deliberately).
+#
+# LocalDirs: woo /data/debarchive/woody ; hamm /data/debarchive/hamm
+
+# Precache a set of files referenced by specified index files. This can be used
+# to create a partial mirror usable for offline work. There are certain limits
+# and restrictions on the path specification, see manual for details. A list of
+# (maybe) relevant index files could be retrieved via 
+# "apt-get --print-uris update" on a client machine.
+#
+# PrecacheFor: debrep/dists/unstable/*/source/Sources* debrep/dists/unstable/*/binary-amd64/Packages*
+
+# Arbitrary set of data to append to request headers sent over the wire. Should
+# be a well formated HTTP headers part including newlines (DOS style) which 
+# can be entered as escape sequences (\r\n).
+# RequestAppendix: X-Tracking-Choice: do-not-track\r\n
+
+# Specifies the IP protocol families to use for remote connections. Order does
+# matter, first specified are considered first. Possible combinations:
+# v6 v4
+# v4 v6
+# v6
+# v4
+# (empty or not set: use system default)
+#
+# ConnectProto: v6 v4
+
+# Regular expiration algorithm finds package files which are no longer listed
+# in any index file and removes them of them after a safety period.
+# This option allows to keep more versions of a package in the cache after
+# safety period is over.
+# KeepExtraVersions: 1
+
+# Optionally uses TCP access control provided by libwrap, see hosts_access(5)
+# for details. Daemon name is apt-cacher-ng. Default if not set: decided on
+# startup by looking for explicit mentioning of apt-cacher-ng in
+# /etc/hosts.allow or /etc/hosts.deny files.
+# UseWrap: 0
+
+# If many machines from the same local network attempt to update index files
+# (apt-get update) at nearly the same time, the known state of these index file
+# is temporarily frozen and multiple requests receive the cached response
+# without contacting the server. This parameter (in seconds) specifies the
+# length of this period before the files are considered outdated.
+# Setting it too low transfers more data and increases remote server load,
+# setting it too high (more than a couple of minutes) increases the risk of
+# delivering inconsistent responses to the clients.
+# FreshIndexMaxAge: 27
+
+# Usually the users are not allowed to specify custom TCP ports of remote
+# mirrors in the requests, only the default HTTP port can be used (instead,
+# proxy administrator can create Remap- rules with custom ports). This
+# restriction can be disabled by specifying a list of allowed ports or 0 for
+# any port.
+#
+# AllowUserPorts: 80
+
+# Normally the HTTP redirection responses are forwarded to the original caller
+# (i.e. APT) which starts a new download attempt from the new URL. This
+# solution is ok for client configurations with proxy mode but doesn't work
+# well with configurations using URL prefixes. To work around this the server
+# can restart its own download with another URL. However, this might be used to
+# circumvent download source policies by malicious users.
+# The RedirMax option specifies how many such redirects the server should
+# follow per request, 0 disables the internal redirection. If not set,
+# default value is 0 if ForceManaged is used and 5 otherwise.
+#
+# RedirMax: 5
\ No newline at end of file
diff --git a/chef/cookbooks/build-essential/.gitignore b/chef/cookbooks/build-essential/.gitignore
new file mode 100644
index 00000000000..fc5b76d486d
--- /dev/null
+++ b/chef/cookbooks/build-essential/.gitignore
@@ -0,0 +1,4 @@
+.bundle
+.cache
+.kitchen
+bin
diff --git a/chef/cookbooks/build-essential/CHANGELOG.md b/chef/cookbooks/build-essential/CHANGELOG.md
new file mode 100644
index 00000000000..4149decfdc8
--- /dev/null
+++ b/chef/cookbooks/build-essential/CHANGELOG.md
@@ -0,0 +1,35 @@
+## v1.3.4:
+
+* [COOK-2272] - Complete `platform_family` conversion in build-essential
+
+## v1.3.2:
+
+* [COOK-2069] - build-essential will install osx-gcc-installer when
+  Xcode is present
+
+## v1.3.0:
+
+ * [COOK-1895] - support smartos
+
+## v1.2.0:
+
+* Add test-kitchen support (source repo only)
+* [COOK-1677] - build-essential cookbook support for OpenSuse and SLES
+* [COOK-1718] - build-essential cookbook metadata should include scientific
+* [COOK-1768] - The apt-get update in build-essentials needs to be renamed
+
+## v1.1.2:
+
+* [COOK-1620] - support OS X 10.8
+
+## v1.1.0:
+
+* [COOK-1098] - support amazon linux
+* [COOK-1149] - support Mac OS X
+* [COOK-1296] - allow for compile-time installation of packages
+  through an attribute (see README)
+
+## v1.0.2:
+
+* [COOK-1098] - Add Amazon Linux platform support
+* [COOK-1149] - Add OS X platform support
diff --git a/chef/cookbooks/build-essential/CONTRIBUTING b/chef/cookbooks/build-essential/CONTRIBUTING
new file mode 100644
index 00000000000..89ac873b4f4
--- /dev/null
+++ b/chef/cookbooks/build-essential/CONTRIBUTING
@@ -0,0 +1,29 @@
+If you would like to contribute, please open a ticket in JIRA:
+
+* http://tickets.opscode.com
+
+Create the ticket in the COOK project and use the cookbook name as the
+component.
+
+For all code contributions, we ask that contributors sign a
+contributor license agreement (CLA). Instructions may be found here:
+
+* http://wiki.opscode.com/display/chef/How+to+Contribute
+
+When contributing changes to individual cookbooks, please do not
+modify the version number in the metadata.rb. Also please do not
+update the CHANGELOG.md for a new version. Not all changes to a
+cookbook may be merged and released in the same versions. Opscode will
+handle the version updates during the release process. You are welcome
+to correct typos or otherwise make updates to documentation in the
+README.
+
+If a contribution adds new platforms or platform versions, indicate
+such in the body of the commit message(s), and update the relevant
+COOK ticket. When writing commit messages, it is helpful for others if
+you indicate the COOK ticket. For example:
+
+    git commit -m '[COOK-1041] Updated pool resource to correctly delete.'
+
+In the ticket itself, it is also helpful if you include log output of
+a successful Chef run, but this is not absolutely required.
diff --git a/chef/cookbooks/build-essential/Gemfile b/chef/cookbooks/build-essential/Gemfile
new file mode 100644
index 00000000000..5586844c501
--- /dev/null
+++ b/chef/cookbooks/build-essential/Gemfile
@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'test-kitchen', '<= 1.0'
diff --git a/chef/cookbooks/build-essential/LICENSE b/chef/cookbooks/build-essential/LICENSE
new file mode 100644
index 00000000000..11069edd790
--- /dev/null
+++ b/chef/cookbooks/build-essential/LICENSE
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/chef/cookbooks/build-essential/README.md b/chef/cookbooks/build-essential/README.md
new file mode 100644
index 00000000000..b3b8fb05f00
--- /dev/null
+++ b/chef/cookbooks/build-essential/README.md
@@ -0,0 +1,131 @@
+Description
+===========
+
+Installs packages required for compiling C software from source. Use
+this cookbook if you wish to compile C programs, or install RubyGems
+with native extensions.
+
+Requirements
+============
+
+Chef version 0.10.10+ and Ohai 0.6.12+ are required.
+
+## Platform
+
+Supported platforms by platform family:
+
+* Linux (fedora redhat centos ubuntu debian amazon scientific)
+* Darwin (`mac_os_x` 10.6+)
+* SmartOs
+
+## Cookbooks
+
+Requires `pkgin` cookbook on SmartOS
+
+Attributes
+==========
+
+* `node['build_essential']['compiletime']` - Whether the resources in
+the default recipe should be configured at the "Compile" phase of the
+Chef run. Defaults to false, see __Usage__ for more information.
+* `node['build_essential']['osx']['gcc_installer_url']` - The URL of
+  the OS X GCC package installer (.pkg).
+* `node['build_essential']['osx']['gcc_installer_checksum']` - The
+  SHA256 checksum of the OS X GCC installer.
+
+Recipes
+=======
+
+This cookbook has one recipe, default.
+
+On Linux platforms (see __Platform__ above for a supported list of
+families), packages required to build C source projects are installed.
+This includes GCC, make, autconf and others. On Debian-family
+distributions, the apt-cache may need to be updated, especially during
+compile time installation. See __Usage__ for further information.
+
+On Mac OS X, the GCC standalone installer by Kenneth Reitz is
+installed. Note that this is *not* the Xcode CLI package, as that does
+not include all programs and headers required to build some common
+GNU-style C projects, such as those that are available from projects
+such as MacPorts or Homebrew. Changing the attributes for the GCC
+installer URL and checksum to the Xcode values may work, but this is
+untested.
+
+Usage
+=====
+
+Simply include the `build-essential` and the required tools will be
+installed to the system, and later recipes will be able to compile
+software from C source code.
+
+For RubyGems that include native C extensions you wish to use with
+Chef, you should do two things.
+
+0. Ensure that the C libraries, include files and other assorted "dev"
+type packages are installed. You should do this in the compile phase
+after the build-essential recipe.
+1. Use the `chef_gem` resource in your recipes. This requires Chef version 0.10.10+.
+2. Set the `compiletime` attribute in roles where such recipes are
+required. This will ensure that the build tools are available to
+compile the RubyGems' extensions, as `chef_gem` happens during the
+compile phase, too.
+
+Example installation of a devel package at compile-time in a recipe:
+
+    package "mypackage-dev" do
+      action :nothing
+    end.run_action(:install)
+
+Example use of `chef_gem`:
+
+    chef_gem "mygem"
+
+Example role:
+
+    name "myapp"
+    run_list(
+      "recipe[build-essential]",
+      "recipe[myapp]"
+    )
+    default_attributes(
+      "build_essential" => {
+        "compiletime" => true
+      }
+    )
+
+The compile time option (via the attribute) is to ensure that the
+proper packages are available at the right time in the Chef run. It is
+recommended that the build-essential recipe appear early in the run
+list.
+
+The Chef wiki has documentation on
+[the anatomy of a chef run](http://wiki.opscode.com/display/chef/Anatomy+of+a+Chef+Run).
+
+Limitations
+===========
+
+It is not in the scope of this cookbook to handle installing the
+required headers for individual software projects in order to compile
+them, or to compile RubyGems with native C extensions. You should
+create a cookbook for handling that.
+
+License and Author
+==================
+
+Author:: Joshua Timberman (<joshua@opscode.com>)
+Author:: Seth Chisamore (<schisamo@opscode.com>)
+
+Copyright 2009-2011, Opscode, Inc. (<legal@opscode.com>)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/chef/cookbooks/build-essential/attributes/default.rb b/chef/cookbooks/build-essential/attributes/default.rb
new file mode 100644
index 00000000000..f45750f02f8
--- /dev/null
+++ b/chef/cookbooks/build-essential/attributes/default.rb
@@ -0,0 +1,33 @@
+#
+# Cookbook Name:: build-essential
+# Attributes:: default
+#
+# Copyright 2008-2012, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+default['build_essential']['compiletime'] = false
+
+case node['platform_family']
+when "mac_os_x"
+  case
+  when Chef::VersionConstraint.new("~> 10.7.0").include?(node['platform_version']),
+       Chef::VersionConstraint.new("~> 10.8.0").include?(node['platform_version'])
+    default['build_essential']['osx']['gcc_installer_url'] = "https://github.com/downloads/kennethreitz/osx-gcc-installer/GCC-10.7-v2.pkg"
+    default['build_essential']['osx']['gcc_installer_checksum'] = "df36aa87606feb99d0db9ac9a492819e"
+  when Chef::VersionConstraint.new("~> 10.6.0").include?(node['platform_version'])
+    default['build_essential']['osx']['gcc_installer_url'] = "https://github.com/downloads/kennethreitz/osx-gcc-installer/GCC-10.6.pkg"
+    default['build_essential']['osx']['gcc_installer_checksum'] = "d1db5bab6a3f6b9f3b5577a130baeefa"
+  end
+end
diff --git a/chef/cookbooks/build-essential/metadata.json b/chef/cookbooks/build-essential/metadata.json
new file mode 100644
index 00000000000..e9301a78719
--- /dev/null
+++ b/chef/cookbooks/build-essential/metadata.json
@@ -0,0 +1,43 @@
+{
+  "name": "build-essential",
+  "description": "Installs C compiler / build tools",
+  "long_description": "",
+  "maintainer": "Opscode, Inc.",
+  "maintainer_email": "cookbooks@opscode.com",
+  "license": "Apache 2.0",
+  "platforms": {
+    "fedora": ">= 0.0.0",
+    "redhat": ">= 0.0.0",
+    "centos": ">= 0.0.0",
+    "ubuntu": ">= 0.0.0",
+    "debian": ">= 0.0.0",
+    "amazon": ">= 0.0.0",
+    "suse": ">= 0.0.0",
+    "scientific": ">= 0.0.0",
+    "oracle": ">= 0.0.0",
+    "smartos": ">= 0.0.0",
+    "mac_os_x": ">= 10.6.0",
+    "mac_os_x_server": ">= 10.6.0"
+  },
+  "dependencies": {
+  },
+  "recommendations": {
+  },
+  "suggestions": {
+    "pkgin": ">= 0.0.0"
+  },
+  "conflicting": {
+  },
+  "providing": {
+  },
+  "replacing": {
+  },
+  "attributes": {
+  },
+  "groupings": {
+  },
+  "recipes": {
+    "build-essential": "Installs packages required for compiling C software from source."
+  },
+  "version": "1.3.4"
+}
\ No newline at end of file
diff --git a/chef/cookbooks/build-essential/metadata.rb b/chef/cookbooks/build-essential/metadata.rb
new file mode 100644
index 00000000000..70b6add3dab
--- /dev/null
+++ b/chef/cookbooks/build-essential/metadata.rb
@@ -0,0 +1,15 @@
+name              "build-essential"
+maintainer        "Opscode, Inc."
+maintainer_email  "cookbooks@opscode.com"
+license           "Apache 2.0"
+description       "Installs C compiler / build tools"
+version           "1.3.4"
+recipe            "build-essential", "Installs packages required for compiling C software from source."
+
+%w{ fedora redhat centos ubuntu debian amazon suse scientific oracle smartos}.each do |os|
+  supports os
+end
+
+supports "mac_os_x", ">= 10.6.0"
+supports "mac_os_x_server", ">= 10.6.0"
+suggests "pkgin"
diff --git a/chef/cookbooks/build-essential/recipes/default.rb b/chef/cookbooks/build-essential/recipes/default.rb
new file mode 100644
index 00000000000..4eff37384f9
--- /dev/null
+++ b/chef/cookbooks/build-essential/recipes/default.rb
@@ -0,0 +1,92 @@
+#
+# Cookbook Name:: build-essential
+# Recipe:: default
+#
+# Copyright 2008-2009, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/shell_out'
+
+compiletime = node['build_essential']['compiletime']
+
+case node['platform_family']
+when "rhel", "suse", "fedora", "debian"
+
+  # on apt-based platforms when first provisioning we need to force
+  # apt-get update at compiletime if we are going to try to install at compiletime
+  if node['platform_family'] == "debian"
+    execute "apt-get-update-build-essentials" do
+      command "apt-get update"
+      action :nothing
+      # tip: to suppress this running every time, just use the apt cookbook
+      not_if do
+        ::File.exists?('/var/lib/apt/periodic/update-success-stamp') &&
+        ::File.mtime('/var/lib/apt/periodic/update-success-stamp') > Time.now - 86400*2
+      end
+    end.run_action(:run) if compiletime
+  end
+
+  packages = case node['platform_family']
+    when "debian"
+      %w{build-essential binutils-doc}
+    when "rhel", "fedora"
+      %w{gcc gcc-c++ kernel-devel make}
+    when "suse"
+      %w{gcc gcc-c++ kernel-default-devel make m4}  # in SLES there is no kernel-devel
+    end
+
+  packages.each do |pkg|
+    r = package pkg do
+      action ( compiletime ? :nothing : :install )
+    end
+    r.run_action(:install) if compiletime
+  end
+
+  %w{autoconf flex bison}.each do |pkg|
+    r = package pkg do
+      action ( compiletime ? :nothing : :install )
+    end
+    r.run_action(:install) if compiletime
+  end
+
+when "smartos"
+    include_recipe 'pkgin'
+    %w{gcc47 gcc47-runtime scmgit-base gmake pkg-config binutils}.each do |package|
+      pkgin_package package do
+        action :install
+      end
+    end
+
+when "mac_os_x"
+  result = Chef::ShellOut.new("pkgutil --pkgs").run_command
+  osx_gcc_installer_installed = result.stdout.split("\n").include?("com.apple.pkg.gcc4.2Leo")
+  developer_tools_cli_installed = result.stdout.split("\n").include?("com.apple.pkg.DeveloperToolsCLI")
+  pkg_filename = File.basename(node['build_essential']['osx']['gcc_installer_url'])
+  pkg_path = "#{Chef::Config[:file_cache_path]}/#{pkg_filename}"
+
+  r = remote_file pkg_path do
+    source node['build_essential']['osx']['gcc_installer_url']
+    checksum node['build_essential']['osx']['gcc_installer_checksum']
+    action ( compiletime ? :nothing : :create )
+    not_if { osx_gcc_installer_installed or developer_tools_cli_installed  }
+  end
+  r.run_action(:create) if compiletime
+
+  r = execute "sudo installer -pkg \"#{pkg_path}\" -target /" do
+    action ( compiletime ? :nothing : :run )
+    not_if { osx_gcc_installer_installed or developer_tools_cli_installed  }
+  end
+  r.run_action(:run) if compiletime
+end
diff --git a/config/database.yml b/chef/cookbooks/discourse/files/default/database.yml
similarity index 100%
rename from config/database.yml
rename to chef/cookbooks/discourse/files/default/database.yml
diff --git a/config/redis.yml b/chef/cookbooks/discourse/files/default/redis.yml
similarity index 100%
rename from config/redis.yml
rename to chef/cookbooks/discourse/files/default/redis.yml
diff --git a/chef/cookbooks/discourse/recipes/default.rb b/chef/cookbooks/discourse/recipes/default.rb
new file mode 100644
index 00000000000..2e58241ea84
--- /dev/null
+++ b/chef/cookbooks/discourse/recipes/default.rb
@@ -0,0 +1,8 @@
+# Install the configuration files we need
+cookbook_file "/vagrant/config/database.yml" do
+  source "database.yml"
+end
+
+cookbook_file "/vagrant/config/redis.yml" do
+  source "redis.yml"
+end
\ No newline at end of file
diff --git a/chef/cookbooks/omnibus_updater/.gitignore b/chef/cookbooks/omnibus_updater/.gitignore
new file mode 100644
index 00000000000..7beac451c16
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/.gitignore
@@ -0,0 +1,5 @@
+.bundle
+.cache
+.kitchen
+bin
+Gemfile.lock
diff --git a/chef/cookbooks/omnibus_updater/CHANGELOG.md b/chef/cookbooks/omnibus_updater/CHANGELOG.md
new file mode 100644
index 00000000000..108284ac388
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/CHANGELOG.md
@@ -0,0 +1,38 @@
+v0.1.2
+======
+* Fix regression on debian package path construction (thanks [ashmere](https://github.com/ashmere))
+
+v0.1.1
+======
+* Search for proper version suffix if not provided (removes default '-1')
+* Do not allow release clients by default when version search is enabled
+* Push omnibus package installation to the end of run (reduces issue described in #10)
+* Allow updater to be disabled via attribute (thanks [Teemu Matilainen](https://github.com/tmatilai))
+
+v0.1.0
+======
+* Fix redhat related versioning issues
+* Remove requirement for '-1' suffix on versions
+* Initial support for automatic latest version install
+
+v0.0.5
+======
+* Add support for Ubuntu 12.10
+* Path fixes for non-64 bit packages (thanks [ashmere](https://github.com/ashmere))
+
+v0.0.4
+======
+* Use new aws bucket by default
+* Update file key building
+
+v0.0.3
+======
+* Path fix for debian omnibus packages (thanks [ashmere](https://github.com/ashmere))
+
+v0.0.2
+======
+* Add robust check when uninstalling chef gem to prevent removal from omnibus
+
+v0.0.1
+======
+* Initial release
diff --git a/chef/cookbooks/omnibus_updater/Gemfile b/chef/cookbooks/omnibus_updater/Gemfile
new file mode 100644
index 00000000000..f0f457b380c
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/Gemfile
@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'test-kitchen'
diff --git a/chef/cookbooks/omnibus_updater/README.md b/chef/cookbooks/omnibus_updater/README.md
new file mode 100644
index 00000000000..79cf2c4a98d
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/README.md
@@ -0,0 +1,82 @@
+OmnibusUpdater
+==============
+
+Update your omnibus! This cookbook can install the omnibus
+Chef package into your system if you are currently running
+via gem install, and it can keep your omnibus install up
+to date.
+
+Usage
+=====
+
+Add the recipe to your run list and specify what version should
+be installed on the node:
+
+`knife node run_list add recipe[omnibus_updater]`
+
+In your role you'll likely want to set the version (it defaults
+to the 0.10.10 version of Chef):
+
+```
+override_attributes(
+  :omnibus_updater => {
+    :version => '10.16.2'
+  }
+)
+```
+
+It can also uninstall Chef from the system Ruby installation
+if you tell it to:
+
+```
+override_attributes(
+  :omnibus_updater => {
+    :remove_chef_system_gem => true
+  }
+)
+```
+---
+
+If you are using a Chef version earlier than 10.12.0 you may want
+to take a look at the chef_gem cookbook to ensure gems are going
+where expected.
+
+---
+
+The default recipe will install the omnibus package based
+on system information but you can override that by using
+the `install_via` attribute which accepts: deb, rpm or script.
+
+Features
+========
+
+Auto version expansion
+----------------------
+
+Versions for the omnibus installer are defined as: x.y.z-n If the `:version` attribute only provides
+x.y.z the `n` value will be automatically filled in with the latest available version.
+
+Auto version searching
+----------------------
+
+Using the `:version_search` attribute, the latest stable version of the omnibus installer will
+be installed automatically as they become available.
+
+Release clients
+---------------
+
+Release clients can be installed via the auto-installation using `:allow_release_clients` attribute.
+
+Disable
+-------
+
+If you want to disable the updater you can set the `disabled`
+attribute to true. This might be useful if the cookbook is added
+to a role but should then be skipped for example on a Chef server.
+
+Infos
+=====
+
+* Repo: https://github.com/hw-cookbooks/omnibus_updater
+* IRC: Freenode @ #heavywater
+
diff --git a/chef/cookbooks/omnibus_updater/attributes/default.rb b/chef/cookbooks/omnibus_updater/attributes/default.rb
new file mode 100644
index 00000000000..3c6a79adcac
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/attributes/default.rb
@@ -0,0 +1,8 @@
+default[:omnibus_updater][:version] = '10.18.2'
+default[:omnibus_updater][:version_search] = false
+default[:omnibus_updater][:base_uri] = 'http://opscode-omnitruck-release.s3.amazonaws.com'
+default[:omnibus_updater][:cache_dir] = '/opt'
+default[:omnibus_updater][:cache_omnibus_installer] = false
+default[:omnibus_updater][:remove_chef_system_gem] = false
+default[:omnibus_updater][:allow_release_clients] = false
+default[:omnibus_updater][:disabled] = false
diff --git a/chef/cookbooks/omnibus_updater/libraries/omnibus_checker.rb b/chef/cookbooks/omnibus_updater/libraries/omnibus_checker.rb
new file mode 100644
index 00000000000..445ae2ab428
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/libraries/omnibus_checker.rb
@@ -0,0 +1,11 @@
+module OmnibusChecker
+  def is_omnibus?
+    Gem.bindir =~ %r{/opt/(opscode|chef)/}
+  end
+end
+
+OmnibusChecker.send(:extend, OmnibusChecker)
+
+unless(Chef::Recipe.instance_methods.include?(:is_omnibus?))
+  Chef::Recipe.send(:include, OmnibusChecker)
+end
diff --git a/chef/cookbooks/omnibus_updater/metadata.json b/chef/cookbooks/omnibus_updater/metadata.json
new file mode 100644
index 00000000000..baeedf89433
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/metadata.json
@@ -0,0 +1,29 @@
+{
+  "name": "omnibus_updater",
+  "description": "Chef omnibus package updater and installer",
+  "long_description": "OmnibusUpdater\n==============\n\nUpdate your omnibus! This cookbook can install the omnibus\nChef package into your system if you are currently running\nvia gem install, and it can keep your omnibus install up\nto date.\n\nUsage\n=====\n\nAdd the recipe to your run list and specify what version should\nbe installed on the node:\n\n`knife node run_list add recipe[omnibus_updater]`\n\nIn your role you'll likely want to set the version (it defaults\nto the 0.10.10 version of Chef):\n\n```\noverride_attributes(\n  :omnibus_updater => {\n    :version => '10.16.2'\n  }\n)\n```\n\nIt can also uninstall Chef from the system Ruby installation\nif you tell it to:\n\n```\noverride_attributes(\n  :omnibus_updater => {\n    :remove_chef_system_gem => true\n  }\n)\n```\n---\n\nIf you are using a Chef version earlier than 10.12.0 you may want\nto take a look at the chef_gem cookbook to ensure gems are going\nwhere expected.\n\n---\n\nThe default recipe will install the omnibus package based\non system information but you can override that by using\nthe `install_via` attribute which accepts: deb, rpm or script.\n\nFeatures\n========\n\nAuto version expansion\n----------------------\n\nVersions for the omnibus installer are defined as: x.y.z-n If the `:version` attribute only provides\nx.y.z the `n` value will be automatically filled in with the latest available version.\n\nAuto version searching\n----------------------\n\nUsing the `:version_search` attribute, the latest stable version of the omnibus installer will\nbe installed automatically as they become available.\n\nRelease clients\n---------------\n\nRelease clients can be installed via the auto-installation using `:allow_release_clients` attribute.\n\nDisable\n-------\n\nIf you want to disable the updater you can set the `disabled`\nattribute to true. This might be useful if the cookbook is added\nto a role but should then be skipped for example on a Chef server.\n\nInfos\n=====\n\n* Repo: https://github.com/hw-cookbooks/omnibus_updater\n* IRC: Freenode @ #heavywater\n\n",
+  "maintainer": "Chris Roberts",
+  "maintainer_email": "chrisroberts.code@gmail.com",
+  "license": "Apache 2.0",
+  "platforms": {
+  },
+  "dependencies": {
+  },
+  "recommendations": {
+  },
+  "suggestions": {
+  },
+  "conflicting": {
+  },
+  "providing": {
+  },
+  "replacing": {
+  },
+  "attributes": {
+  },
+  "groupings": {
+  },
+  "recipes": {
+  },
+  "version": "0.1.2"
+}
\ No newline at end of file
diff --git a/chef/cookbooks/omnibus_updater/metadata.rb b/chef/cookbooks/omnibus_updater/metadata.rb
new file mode 100644
index 00000000000..f4746acfcbd
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/metadata.rb
@@ -0,0 +1,7 @@
+maintainer       "Chris Roberts"
+maintainer_email "chrisroberts.code@gmail.com"
+license          "Apache 2.0"
+description      "Chef omnibus package updater and installer"
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          "0.1.2"
+
diff --git a/chef/cookbooks/omnibus_updater/recipes/deb_downloader.rb b/chef/cookbooks/omnibus_updater/recipes/deb_downloader.rb
new file mode 100644
index 00000000000..abb6e5f3499
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/recipes/deb_downloader.rb
@@ -0,0 +1,18 @@
+# NOTE: This recipe is here for others that just want the
+# package, not the actual installation (lxc for example)
+
+include_recipe 'omnibus_updater::set_remote_path'
+
+remote_file "chef omnibus_package_downloader[#{File.basename(node[:omnibus_updater][:full_uri])}]" do
+  path File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))
+  source node[:omnibus_updater][:full_uri]
+  backup false
+  only_if do
+    node[:omnibus_updater][:cache_omnibus_installer] &&
+    !File.exists?(
+      File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))
+    )
+  end
+end
+
+include_recipe 'omnibus_updater::old_package_cleaner'
diff --git a/chef/cookbooks/omnibus_updater/recipes/deb_package.rb b/chef/cookbooks/omnibus_updater/recipes/deb_package.rb
new file mode 100644
index 00000000000..172556da5cf
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/recipes/deb_package.rb
@@ -0,0 +1,30 @@
+include_recipe 'omnibus_updater::set_remote_path'
+
+remote_file "chef omnibus_package[#{File.basename(node[:omnibus_updater][:full_uri])}]" do
+  path File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))
+  source node[:omnibus_updater][:full_uri]
+  backup false
+  not_if do
+    File.exists?(
+      File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))
+    ) || (
+      Chef::VERSION.to_s.scan(/\d+\.\d+\.\d+/) == node[:omnibus_updater][:full_version].scan(/\d+\.\d+\.\d+/) && OmnibusChecker.is_omnibus?
+    )
+  end
+  notifies :create, 'ruby_block[Omnibus Chef install notifier]', :delayed
+end
+
+ruby_block 'Omnibus Chef install notifier' do
+  block do
+    true
+  end
+  action :nothing
+  notifies :run, "execute[chef omnibus_install[#{node[:omnibus_updater][:full_version]}]]", :delayed
+end
+
+execute "chef omnibus_install[#{node[:omnibus_updater][:full_version]}]" do
+  command "dpkg -i #{File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))}"
+  action :nothing
+end
+
+include_recipe 'omnibus_updater::old_package_cleaner'
diff --git a/chef/cookbooks/omnibus_updater/recipes/default.rb b/chef/cookbooks/omnibus_updater/recipes/default.rb
new file mode 100644
index 00000000000..337578d9647
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/recipes/default.rb
@@ -0,0 +1,25 @@
+if node[:omnibus_updater][:disabled]
+  Chef::Log.warn 'Omnibus updater disabled via `disabled` attribute'
+elsif node[:omnibus_updater][:install_via]
+  case node[:omnibus_updater][:install_via]
+  when 'deb'
+    include_recipe 'omnibus_updater::deb_package'
+  when 'rpm'
+    include_recipe 'omnibus_updater::rpm_package'
+  when 'script'
+    include_recipe 'omnibus_updater::script'
+  else
+    raise "Unknown omnibus update method requested: #{node[:omnibus_updater][:install_via]}"
+  end
+else
+  case node.platform_family
+  when 'debian'
+    include_recipe 'omnibus_updater::deb_package'
+  when 'fedora', 'rhel'
+    include_recipe 'omnibus_updater::rpm_package'
+  else
+    include_recipe 'omnibus_updater::script'
+  end
+end
+
+include_recipe 'omnibus_updater::remove_chef_system_gem' if node[:omnibus_updater][:remove_chef_system_gem]
diff --git a/chef/cookbooks/omnibus_updater/recipes/old_package_cleaner.rb b/chef/cookbooks/omnibus_updater/recipes/old_package_cleaner.rb
new file mode 100644
index 00000000000..156cd4fa5ae
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/recipes/old_package_cleaner.rb
@@ -0,0 +1,14 @@
+old_pkgs =
+  if(::File.exist?(node[:omnibus_updater][:cache_dir]))
+    Dir.glob(File.join(node[:omnibus_updater][:cache_dir], 'chef*')).find_all do |file|
+      !file.include?(node[:omnibus_updater][:version]) && !file.scan(/\.(rpm|deb)$/).empty?
+    end
+  else
+    []
+  end
+
+old_pkgs.each do |filename|
+  file filename do
+    action :delete
+  end
+end
diff --git a/chef/cookbooks/omnibus_updater/recipes/remove_chef_system_gem.rb b/chef/cookbooks/omnibus_updater/recipes/remove_chef_system_gem.rb
new file mode 100644
index 00000000000..9db16448675
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/recipes/remove_chef_system_gem.rb
@@ -0,0 +1,10 @@
+gem_package 'chef' do
+  action :purge
+  only_if do
+    Chef::Provider::Package::Rubygems.new(
+      Chef::Resource::GemPackage.new('dummy_package')
+    ).gem_env.gem_paths.detect{|path|
+      path.start_with?('/opt/omnibus') || path.start_with?('/opt/chef')
+    }.nil? && node[:omnibus_updater][:remove_chef_system_gem]
+  end
+end
diff --git a/chef/cookbooks/omnibus_updater/recipes/rpm_package.rb b/chef/cookbooks/omnibus_updater/recipes/rpm_package.rb
new file mode 100644
index 00000000000..7d26dd3d361
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/recipes/rpm_package.rb
@@ -0,0 +1,30 @@
+include_recipe 'omnibus_updater::set_remote_path'
+
+remote_file "chef omnibus_package[#{File.basename(node[:omnibus_updater][:full_uri])}]" do
+  path File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))
+  source node[:omnibus_updater][:full_uri]
+  backup false
+  not_if do
+    File.exists?(
+      File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))
+    ) || (
+      Chef::VERSION.to_s.scan(/\d+\.\d+\.\d+/) == node[:omnibus_updater][:full_version].scan(/\d+\.\d+\.\d+/) && OmnibusChecker.is_omnibus?
+    )
+  end
+  notifies :create, 'ruby_block[Omnibus Chef install notifier]', :delayed
+end
+
+ruby_block 'Omnibus Chef install notifier' do
+  block do
+    true
+  end
+  action :nothing
+  notifies :run, "execute[chef omnibus_install[#{node[:omnibus_updater][:full_version]}]]", :delayed
+end
+
+execute "chef omnibus_install[#{node[:omnibus_updater][:full_version]}]" do
+  command "rpm -Uvh #{File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))}"
+  action :nothing
+end
+
+include_recipe 'omnibus_updater::old_package_cleaner'
diff --git a/chef/cookbooks/omnibus_updater/recipes/script.rb b/chef/cookbooks/omnibus_updater/recipes/script.rb
new file mode 100644
index 00000000000..0a8c1282a29
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/recipes/script.rb
@@ -0,0 +1,38 @@
+include_recipe 'omnibus_updater::set_remote_path'
+
+remote_file "chef omnibus_script[#{File.basename(node[:omnibus_updater][:full_uri])}]" do
+  path File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))
+  source node[:omnibus_updater][:full_uri]
+  backup false
+  not_if do
+    File.exists?(
+      File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))
+    ) || (
+      Chef::VERSION.to_s.scan(/\d+\.\d+\.\d+/) == node[:omnibus_updater][:full_version].scan(/\d+\.\d+\.\d+/) && OmnibusChecker.is_omnibus?
+    )
+  end
+end
+
+# NOTE: We do not use notifications to trigger the install
+#   since they are broken with remote_file in 0.10.10
+execute "chef omnibus_install[#{node[:omnibus_updater][:full_version]}]" do
+  command "bash #{File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))}"
+  only_if do
+    (File.exists?(
+      File.join(node[:omnibus_updater][:cache_dir], File.basename(node[:omnibus_updater][:full_uri]))
+    ) &&
+    Chef::VERSION.to_s.scan(/\d+\.\d+\.\d+/) != node[:omnibus_updater][:full_version].scan(/\d+\.\d+\.\d+/)) ||
+    !OmnibusChecker.is_omnibus?
+  end
+end
+
+ruby_block "omnibus_updater[remove old install scripts]" do
+  block do
+    Dir.glob(File.join(node[:omnibus_updater][:cache_dir], 'chef*.sh')).each do |file|
+      unless(file.include?(node[:omnibus_updater][:version]))
+        Chef::Log.info "Deleting stale omnibus script: #{file}"
+        File.delete(file)
+      end
+    end
+  end
+end
diff --git a/chef/cookbooks/omnibus_updater/recipes/set_remote_path.rb b/chef/cookbooks/omnibus_updater/recipes/set_remote_path.rb
new file mode 100644
index 00000000000..d5410cc31b4
--- /dev/null
+++ b/chef/cookbooks/omnibus_updater/recipes/set_remote_path.rb
@@ -0,0 +1,139 @@
+# RULES
+
+if(node[:omnibus_updater][:version].nil? && !node[:omnibus_updater][:version_search])
+  raise "Omnibus Updater cannot determine version installation request. Please set version of enable version search"
+end
+
+if(node[:omnibus_updater][:version_search])
+  Chef::Log.warn "Omnibus Updater is set to automatically upgrade via search!"
+  if(node[:omnibus_updater][:allow_release_clients])
+    Chef::Log.warn "Omnibus Updater will allow installation of release clients found via search!"
+  end
+end
+
+if(!node[:omnibus_updater][:version].to_s.include?('-') || node[:omnibus_updater][:version_search])
+  require 'open-uri'
+  require 'rexml/document'
+  pkgs_doc = REXML::Document.new(open(node[:omnibus_updater][:base_uri]))
+  pkgs_avail = pkgs_doc.elements.to_a('//Contents//Key').map(&:text).find_all do |f|
+    (f.include?('.rpm') || f.include?('.deb')) && f.include?('chef') &&
+      !f.include?('server') && (node[:omnibus_updater][:allow_release_clients] || !f.include?('.rc')) &&
+      !f.scan(/\d+\.\d+\.\d+-\d+\./).empty?
+  end
+  unless(node[:omnibus_updater][:version_search])
+    searched_ver = pkgs_avail.find_all{|x| x.include?(node[:omnibus_updater][:version]) }.sort.last
+    unless(searched_ver)
+      raise "Omnibus Updater failed to find a valid version string. Base version requested: #{node[:omnibus_updater][:version]}"
+    else
+      node.set[:omnibus_updater][:full_version] = searched_ver.scan(/\d+\.\d+\.\d+-\d+/).first
+      node.set[:omnibus_updater][:version] = node[:omnibus_updater][:full_version].sub(/-\d+$/,'')
+    end
+  end
+else
+  node.set[:omnibus_updater][:full_version] = node[:omnibus_updater][:version]
+end
+
+platform_name = node.platform
+platform_majorversion = ""
+kernel_name = node.kernel.machine
+case node.platform_family
+when 'debian'
+  if(node.platform == 'ubuntu')
+    platform_version = case node.platform_version
+    when '10.10', '10.04'
+       platform_majorversion << '10.04'
+      '10.04'
+    when '12.10', '12.04', '11.10', '11.04'
+       platform_majorversion << '11.04'
+      '11.04'
+    else
+      raise 'Unsupported ubuntu version for deb packaged omnibus'
+    end
+  else
+    platform_version = case pv = node.platform_version.split('.').first
+    when '6', '5'
+      platform_majorversion << '6'
+      '6.0.5'
+    else
+      platform_majorversion << pv
+      pv
+    end
+  end
+when 'fedora', 'rhel'
+  platform_version = node.platform_version.split('.').first
+  platform_name = 'el'
+  platform_majorversion << platform_version
+else
+  platform_version = node.platform_version
+end
+
+if(node[:omnibus_updater][:install_via])
+  install_via = node[:omnibus_updater][:install_via]
+else
+  install_via = case node.platform_family
+  when 'debian'
+    'deb'
+  when 'fedora', 'rhel', 'centos'
+    'rpm'
+  else
+    raise 'Unsupported omnibus install method requested'
+  end
+end
+case install_via
+when 'deb'
+  if(pkgs_avail)
+    path_name = pkgs_avail.find_all{ |path|
+      ver = node[:omnibus_updater][:version] || '.'
+      path.include?('.deb') && path.include?(platform_name) && 
+      path.include?(platform_version) && path.include?(node.kernel.machine) &&
+      path.include?(ver)
+    }.sort.last
+  else
+    kernel_name = ""
+    file_name = "chef_#{node[:omnibus_updater][:full_version]}.#{platform_name}.#{platform_version}_"
+    if(node.kernel.machine.include?('64'))
+      file_name << 'amd64'
+      kernel_name << 'x86_64'
+    else
+      file_name << 'i386'
+      kernel_name << 'i686'
+    end
+    file_name << '.deb'
+  end
+when 'rpm'
+  if(pkgs_avail)
+    path_name = pkgs_avail.find_all{ |path|
+      ver = node[:omnibus_updater][:version] || '.'
+      path.include?('.rpm') && path.include?(platform_name) && 
+      path.include?(platform_version) && path.include?(node.kernel.machine) &&
+      path.include?(ver)
+    }.sort.last
+  else
+    file_name = "chef-#{node[:omnibus_updater][:full_version]}.#{platform_name}#{platform_version}.#{node.kernel.machine}.rpm"
+  end
+else
+  raise 'Unsupported install via provided'
+end
+
+remote_omnibus_file = if(path_name)
+    File.join(node[:omnibus_updater][:base_uri], path_name)
+  else
+    File.join(
+      node[:omnibus_updater][:base_uri],
+      platform_name,
+      platform_majorversion,
+      kernel_name,
+      file_name
+    )
+  end
+
+unless(remote_omnibus_file == node[:omnibus_updater][:full_uri])
+  node.override[:omnibus_updater][:full_uri] = remote_omnibus_file
+  Chef::Log.info "Omnibus remote file location: #{remote_omnibus_file}"
+end
+
+unless(node[:omnibus_updater][:full_version])
+  node.set[:omnibus_updater][:version] = remote_omnibus_file.scan(%r{chef[_-](\d+.\d+.\d+-\d+)}).flatten.first
+  node.set[:omnibus_updater][:full_version] = node[:omnibus_updater][:version]
+end
+
diff --git a/chef/cookbooks/phantomjs/CHANGELOG.md b/chef/cookbooks/phantomjs/CHANGELOG.md
new file mode 100644
index 00000000000..35944878848
--- /dev/null
+++ b/chef/cookbooks/phantomjs/CHANGELOG.md
@@ -0,0 +1,6 @@
+phantomjs CHANGELOG
+===================
+
+v.0.0.6
+-------
+- Initial CHANGELOG created
diff --git a/chef/cookbooks/phantomjs/README.md b/chef/cookbooks/phantomjs/README.md
new file mode 100644
index 00000000000..5fabbf1f1ea
--- /dev/null
+++ b/chef/cookbooks/phantomjs/README.md
@@ -0,0 +1,27 @@
+phantomjs Cookbook
+==================
+[![Build Status](https://secure.travis-ci.org/customink-webops/phantomjs.png?branch=master)](http://travis-ci.org/customink-webops/phantomjs)
+
+Installs the phantomjs cookbook and necessary packages. This repository also features a full test suite!
+
+Attributes
+----------
+- `default['phantomjs']['version']` - the version number to install
+
+Contributing
+------------
+1. Fork the project
+2. Create a feature branch (i.e. `add_feature_x`)
+3. Make your changes
+4. Write or change specs as necessary
+5. Ensure the specs pass:
+
+    $ bundle exec rspec
+
+6. Submit a pull request on github
+
+License and Authors
+-------------------
+Author: [Seth Vargo](https://github.com/sethvargo)
+
+Copyright 2012, CustomInk, LLC
diff --git a/chef/cookbooks/phantomjs/attributes/default.rb b/chef/cookbooks/phantomjs/attributes/default.rb
new file mode 100644
index 00000000000..18630dbf677
--- /dev/null
+++ b/chef/cookbooks/phantomjs/attributes/default.rb
@@ -0,0 +1,3 @@
+default['phantomjs'] = {
+  'version' => '1.7.0'
+}
diff --git a/chef/cookbooks/phantomjs/metadata.json b/chef/cookbooks/phantomjs/metadata.json
new file mode 100644
index 00000000000..65e983dbdcc
--- /dev/null
+++ b/chef/cookbooks/phantomjs/metadata.json
@@ -0,0 +1,52 @@
+{
+  "name": "phantomjs",
+  "description": "Installs/Configures phantomjs",
+  "long_description": "phantomjs Cookbook\n==================\n[![Build Status](https://secure.travis-ci.org/customink-webops/phantomjs.png?branch=master)](http://travis-ci.org/customink-webops/phantomjs)\n\nInstalls the phantomjs cookbook and necessary packages. This repository also features a full test suite!\n\nAttributes\n----------\n- `default['phantomjs']['version']` - the version number to install\n\nContributing\n------------\n1. Fork the project\n2. Create a feature branch (i.e. `add_feature_x`)\n3. Make your changes\n4. Write or change specs as necessary\n5. Ensure the specs pass:\n\n    $ bundle exec rspec\n\n6. Submit a pull request on github\n\nLicense and Authors\n-------------------\nAuthor: [Seth Vargo](https://github.com/sethvargo)\n\nCopyright 2012, CustomInk, LLC\n",
+  "maintainer": "CustomInk",
+  "maintainer_email": "webops@customink.com",
+  "license": "Apache 2.0",
+  "platforms": {
+    "amazon": ">= 0.0.0",
+    "centos": ">= 0.0.0",
+    "debian": ">= 0.0.0",
+    "fedora": ">= 0.0.0",
+    "oracle": ">= 0.0.0",
+    "rhel": ">= 0.0.0",
+    "scientific": ">= 0.0.0",
+    "ubuntu": ">= 0.0.0"
+  },
+  "dependencies": {
+  },
+  "recommendations": {
+  },
+  "suggestions": {
+  },
+  "conflicting": {
+  },
+  "providing": {
+  },
+  "replacing": {
+  },
+  "attributes": {
+    "version": {
+      "display_name": "Version",
+      "description": "The Version of phantomjs to install",
+      "default": "1.7.0",
+      "choice": [
+
+      ],
+      "calculated": false,
+      "type": "string",
+      "required": "optional",
+      "recipes": [
+
+      ]
+    }
+  },
+  "groupings": {
+  },
+  "recipes": {
+    "phantomjs::default": "Install phantomjs binary"
+  },
+  "version": "0.0.10"
+}
\ No newline at end of file
diff --git a/chef/cookbooks/phantomjs/metadata.rb b/chef/cookbooks/phantomjs/metadata.rb
new file mode 100644
index 00000000000..7cc0cfe02ea
--- /dev/null
+++ b/chef/cookbooks/phantomjs/metadata.rb
@@ -0,0 +1,18 @@
+name 'phantomjs'
+maintainer 'CustomInk'
+maintainer_email 'webops@customink.com'
+license 'Apache 2.0'
+description 'Installs/Configures phantomjs'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version '0.0.10'
+
+recipe 'phantomjs::default', 'Install phantomjs binary'
+
+%w(amazon centos debian fedora oracle rhel scientific ubuntu).each do |os|
+  supports os
+end
+
+attribute 'version',
+  :display_name => 'Version',
+  :description => 'The Version of phantomjs to install',
+  :default => '1.7.0'
diff --git a/chef/cookbooks/phantomjs/recipes/default.rb b/chef/cookbooks/phantomjs/recipes/default.rb
new file mode 100644
index 00000000000..5f8b2c2e9b2
--- /dev/null
+++ b/chef/cookbooks/phantomjs/recipes/default.rb
@@ -0,0 +1,52 @@
+#
+# Cookbook Name:: phantomjs
+# Recipe:: default
+#
+# Copyright 2012, CustomInk
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Packages
+case node['platform_family']
+when 'debian'
+  %w(fontconfig libfreetype6).each do |package|
+    package package
+  end
+when 'fedora','rhel'
+  %w(fontconfig freetype).each do |package|
+    package package
+  end
+end
+
+basename = "phantomjs-#{node['phantomjs']['version']}-linux-#{node['kernel']['machine']}"
+
+# Download the tarball
+remote_file "/usr/local/src/#{basename}.tar.bz2" do
+  action :create_if_missing
+  backup false
+  mode '0644'
+  checksum node['phantomjs']['checksum'] if node['phantomjs']['checksum']
+  source "https://phantomjs.googlecode.com/files/#{basename}.tar.bz2"
+end
+
+# Install phantomjs
+execute 'Install phantomjs' do
+  command "tar -xvjf /usr/local/src/#{basename}.tar.bz2 -C /usr/local/"
+  not_if "test -d /usr/local/#{basename}"
+end
+
+# Set up the symbolic link
+link '/usr/local/bin/phantomjs' do
+  to "/usr/local/#{basename}/bin/phantomjs"
+end
diff --git a/chef/cookbooks/vim/README.md b/chef/cookbooks/vim/README.md
new file mode 100644
index 00000000000..7186b128aaf
--- /dev/null
+++ b/chef/cookbooks/vim/README.md
@@ -0,0 +1,50 @@
+Description
+===========
+
+Installs vim.
+
+Requirements
+============
+
+## Platform:
+
+* Ubuntu/Debian
+* Red Hat/CentOS/Fedora/Scientific
+* ArchLinux
+
+Attributes
+==========
+
+* `node[:vim][:extra_packages]` - An array of extra packages related to vim to install (like plugins). Empty array by default.
+
+Usage
+=====
+
+Put `recipe[vim]` in a run list, or `include_recipe 'vim'` to ensure that vim is installed on your systems.
+
+If you would like to install additional vim plugin packages, include their package names in the `node[:vim][:extra_packages]` attribute. Verify that your operating sytem has the package available.
+
+Changes
+=======
+
+## v1.0.2:
+
+* Fixes COOK-598 (RHEL platforms support).
+
+License and Author
+==================
+
+Author:: Joshua Timberman <joshua@opscode.com>
+
+Copyright 2010, Opscode, Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
diff --git a/chef/cookbooks/vim/attributes/default.rb b/chef/cookbooks/vim/attributes/default.rb
new file mode 100644
index 00000000000..08e9e47d49d
--- /dev/null
+++ b/chef/cookbooks/vim/attributes/default.rb
@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: vim
+# Attributes:: default
+#
+# Copyright 2010, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+default[:vim][:extra_packages] = []
diff --git a/chef/cookbooks/vim/metadata.json b/chef/cookbooks/vim/metadata.json
new file mode 100644
index 00000000000..f743602c6d0
--- /dev/null
+++ b/chef/cookbooks/vim/metadata.json
@@ -0,0 +1,36 @@
+{
+  "name": "vim",
+  "description": "Installs vim and optional extra packages.",
+  "long_description": "Description\n===========\n\nInstalls vim.\n\nRequirements\n============\n\n## Platform:\n\n* Ubuntu/Debian\n* Red Hat/CentOS/Fedora/Scientific\n* ArchLinux\n\nAttributes\n==========\n\n* `node[:vim][:extra_packages]` - An array of extra packages related to vim to install (like plugins). Empty array by default.\n\nUsage\n=====\n\nPut `recipe[vim]` in a run list, or `include_recipe 'vim'` to ensure that vim is installed on your systems.\n\nIf you would like to install additional vim plugin packages, include their package names in the `node[:vim][:extra_packages]` attribute. Verify that your operating sytem has the package available.\n\nChanges\n=======\n\n## v1.0.2:\n\n* Fixes COOK-598 (RHEL platforms support).\n\nLicense and Author\n==================\n\nAuthor:: Joshua Timberman <joshua@opscode.com>\n\nCopyright 2010, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\n",
+  "maintainer": "Opscode, Inc.",
+  "maintainer_email": "cookbooks@opscode.com",
+  "license": "Apache 2.0",
+  "platforms": {
+    "debian": ">= 0.0.0",
+    "ubuntu": ">= 0.0.0",
+    "arch": ">= 0.0.0",
+    "redhat": ">= 0.0.0",
+    "centos": ">= 0.0.0",
+    "fedora": ">= 0.0.0",
+    "scientific": ">= 0.0.0"
+  },
+  "dependencies": {
+  },
+  "recommendations": {
+  },
+  "suggestions": {
+  },
+  "conflicting": {
+  },
+  "providing": {
+  },
+  "replacing": {
+  },
+  "attributes": {
+  },
+  "groupings": {
+  },
+  "recipes": {
+  },
+  "version": "1.0.2"
+}
\ No newline at end of file
diff --git a/chef/cookbooks/vim/metadata.rb b/chef/cookbooks/vim/metadata.rb
new file mode 100644
index 00000000000..25f185d0f4c
--- /dev/null
+++ b/chef/cookbooks/vim/metadata.rb
@@ -0,0 +1,11 @@
+maintainer       "Opscode, Inc."
+maintainer_email "cookbooks@opscode.com"
+license          "Apache 2.0"
+description      "Installs vim and optional extra packages."
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          "1.0.2"
+
+%w{debian ubuntu arch redhat centos fedora scientific}.each do |os|
+  supports os
+end
+
diff --git a/chef/cookbooks/vim/recipes/default.rb b/chef/cookbooks/vim/recipes/default.rb
new file mode 100644
index 00000000000..cb5f1a2c68f
--- /dev/null
+++ b/chef/cookbooks/vim/recipes/default.rb
@@ -0,0 +1,35 @@
+#
+# Cookbook Name:: vim
+# Recipe:: default
+#
+# Copyright 2010, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# There is no vim package on RHEL/CentOS derivatives
+# * vim-minimal gives you /bin/vi
+# * vim-enhanced gives you /usr/bin/vim
+vim_base_pkgs = value_for_platform(
+  ["ubuntu", "debian", "arch"] => { "default" => ["vim"] },
+  ["redhat", "centos", "fedora", "scientific"] => { "default" => ["vim-minimal","vim-enhanced"] },
+  "default" => ["vim"]
+)
+
+vim_base_pkgs.each do |vim_base_pkg|
+  package vim_base_pkg
+end
+
+node[:vim][:extra_packages].each do |vimpkg|
+  package vimpkg
+end
diff --git a/config/database.yml.sample b/config/database.yml.sample
new file mode 100644
index 00000000000..1fd6a466e59
--- /dev/null
+++ b/config/database.yml.sample
@@ -0,0 +1,30 @@
+development:
+  adapter: postgresql
+  database: discourse_development
+  host: localhost
+  pool: 5
+  timeout: 5000
+  host_names:
+    - "localhost"
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: postgresql
+  database: discourse_test
+  host: localhost
+  pool: 5
+  timeout: 5000
+  host_names:
+    - test.localhost
+
+# using the test db, so jenkins can run this config
+# we need it to be in production so it minifies assets
+production:
+  adapter: postgresql
+  database: discourse_development
+  pool: 5
+  timeout: 5000
+  host_names:
+    - production.localhost
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e6a0203b993..127e8d95b76 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -259,7 +259,7 @@ en:
     posts_per_page: "How many posts are returned on a topic page"
     system_username: "Username that sends system messages"
     send_welcome_message: "Do new users get a welcome private message?"
-    
+    supress_reply_directly_below: "Don't show replies button below a post when the reply is directly below"
     allow_index_in_robots_txt: "Site should be indexed by search engines (update robots.txt)"
 
     port: "If you'd like to specify a port in the URL. Useful in development mode. Leave blank for none."
@@ -472,19 +472,19 @@ en:
       activity_stream: "Activity"
       preferences: "Preferences"
       bio: "About me"
-      change_password: "change password"
+      change_password: "change"
       invited_by: "Invited By"
       trust_level: "Trust Level"
 
       change_username: 
-        action: "change username"
+        action: "change"
         title: "Change Username"
         confirm: "There could be consequences to changing your username. Are you absolutely sure you want to?"
         taken: "Sorry that username is taken."
         error: "There was an error changing your username."
         invalid: "That username is invalid. It must only include numbers and letters"
       change_email:
-        action: 'change email'
+        action: 'change'
         title: "Change Email"
         taken: "Sorry that email is not available."
         error: "There was an error changing your email. Perhaps that address is already in use?"
@@ -524,7 +524,7 @@ en:
       website: "Web Site"
       email_settings: "Email"
       email_digests: 
-        title: "Receive an email digest of what's new"
+        title: "When I don't visit the site, send me an email digest of what's new"
         daily: "daily"
         weekly: "weekly"
         bi_weekly: "every two weeks"
diff --git a/config/redis.yml.sample b/config/redis.yml.sample
new file mode 100644
index 00000000000..68d138b5ff6
--- /dev/null
+++ b/config/redis.yml.sample
@@ -0,0 +1,18 @@
+defaults: &defaults
+  host: localhost
+  port: 6379
+  db: 0
+  cache_db: 2
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults 
+  db: 1
+
+staging:
+  <<: *defaults
+
+production:
+  <<: *defaults
diff --git a/db/schema.rb b/db/schema.rb
deleted file mode 100644
index 929afd1e0df..00000000000
--- a/db/schema.rb
+++ /dev/null
@@ -1,514 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20130205021905) do
-
-  create_table "categories", :force => true do |t|
-    t.string   "name",          :limit => 50,                       :null => false
-    t.string   "color",         :limit => 6,  :default => "AB9364", :null => false
-    t.integer  "topic_id"
-    t.integer  "top1_topic_id"
-    t.integer  "top2_topic_id"
-    t.integer  "top1_user_id"
-    t.integer  "top2_user_id"
-    t.integer  "topic_count",                 :default => 0,        :null => false
-    t.datetime "created_at",                                        :null => false
-    t.datetime "updated_at",                                        :null => false
-    t.integer  "user_id",                                           :null => false
-    t.integer  "topics_year"
-    t.integer  "topics_month"
-    t.integer  "topics_week"
-    t.string   "slug",                                              :null => false
-  end
-
-  add_index "categories", ["name"], :name => "index_categories_on_name", :unique => true
-  add_index "categories", ["topic_count"], :name => "index_categories_on_forum_thread_count"
-
-  create_table "categories_search", :id => false, :force => true do |t|
-    t.integer  "id",          :null => false
-    t.tsvector "search_data"
-  end
-
-  add_index "categories_search", ["search_data"], :name => "idx_search_category"
-
-  create_table "category_featured_topics", :id => false, :force => true do |t|
-    t.integer  "category_id", :null => false
-    t.integer  "topic_id",    :null => false
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  add_index "category_featured_topics", ["category_id", "topic_id"], :name => "cat_featured_threads", :unique => true
-
-  create_table "category_featured_users", :force => true do |t|
-    t.integer  "category_id"
-    t.integer  "user_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
-  add_index "category_featured_users", ["category_id", "user_id"], :name => "index_category_featured_users_on_category_id_and_user_id", :unique => true
-
-  create_table "draft_sequences", :force => true do |t|
-    t.integer "user_id",   :null => false
-    t.string  "draft_key", :null => false
-    t.integer "sequence",  :null => false
-  end
-
-  add_index "draft_sequences", ["user_id", "draft_key"], :name => "index_draft_sequences_on_user_id_and_draft_key", :unique => true
-
-  create_table "drafts", :force => true do |t|
-    t.integer  "user_id",                   :null => false
-    t.string   "draft_key",                 :null => false
-    t.text     "data",                      :null => false
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-    t.integer  "sequence",   :default => 0, :null => false
-  end
-
-  add_index "drafts", ["user_id", "draft_key"], :name => "index_drafts_on_user_id_and_draft_key"
-
-  create_table "email_logs", :force => true do |t|
-    t.string   "to_address", :null => false
-    t.string   "email_type", :null => false
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "email_logs", ["created_at"], :name => "index_email_logs_on_created_at", :order => {"created_at"=>:desc}
-  add_index "email_logs", ["user_id", "created_at"], :name => "index_email_logs_on_user_id_and_created_at", :order => {"created_at"=>:desc}
-
-  create_table "email_tokens", :force => true do |t|
-    t.integer  "user_id",                       :null => false
-    t.string   "email",                         :null => false
-    t.string   "token",                         :null => false
-    t.boolean  "confirmed",  :default => false, :null => false
-    t.boolean  "expired",    :default => false, :null => false
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-  end
-
-  add_index "email_tokens", ["token"], :name => "index_email_tokens_on_token", :unique => true
-
-  create_table "facebook_user_infos", :force => true do |t|
-    t.integer  "user_id",                       :null => false
-    t.integer  "facebook_user_id", :limit => 8, :null => false
-    t.string   "username",                      :null => false
-    t.string   "first_name"
-    t.string   "last_name"
-    t.string   "email"
-    t.string   "gender"
-    t.string   "name"
-    t.string   "link"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-  end
-
-  add_index "facebook_user_infos", ["facebook_user_id"], :name => "index_facebook_user_infos_on_facebook_user_id", :unique => true
-  add_index "facebook_user_infos", ["user_id"], :name => "index_facebook_user_infos_on_user_id", :unique => true
-
-  create_table "incoming_links", :force => true do |t|
-    t.string   "url",         :limit => 1000, :null => false
-    t.string   "referer",     :limit => 1000, :null => false
-    t.string   "domain",      :limit => 100,  :null => false
-    t.integer  "topic_id"
-    t.integer  "post_number"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-  end
-
-  add_index "incoming_links", ["topic_id", "post_number"], :name => "incoming_index"
-
-  create_table "invites", :force => true do |t|
-    t.string   "invite_key",    :limit => 32, :null => false
-    t.string   "email",                       :null => false
-    t.integer  "invited_by_id",               :null => false
-    t.integer  "user_id"
-    t.datetime "redeemed_at"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.datetime "deleted_at"
-  end
-
-  add_index "invites", ["email", "invited_by_id"], :name => "index_invites_on_email_and_invited_by_id", :unique => true
-  add_index "invites", ["invite_key"], :name => "index_invites_on_invite_key", :unique => true
-
-  create_table "message_bus", :force => true do |t|
-    t.string   "name"
-    t.string   "context"
-    t.text     "data"
-    t.datetime "created_at"
-  end
-
-  add_index "message_bus", ["created_at"], :name => "index_message_bus_on_created_at"
-
-  create_table "notifications", :force => true do |t|
-    t.integer  "notification_type",                    :null => false
-    t.integer  "user_id",                              :null => false
-    t.string   "data",                                 :null => false
-    t.boolean  "read",              :default => false, :null => false
-    t.datetime "created_at",                           :null => false
-    t.datetime "updated_at",                           :null => false
-    t.integer  "topic_id"
-    t.integer  "post_number"
-    t.integer  "post_action_id"
-  end
-
-  add_index "notifications", ["post_action_id"], :name => "index_notifications_on_post_action_id"
-  add_index "notifications", ["user_id", "created_at"], :name => "index_notifications_on_user_id_and_created_at"
-
-  create_table "onebox_renders", :force => true do |t|
-    t.string   "url",        :null => false
-    t.text     "cooked",     :null => false
-    t.datetime "expires_at", :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.text     "preview"
-  end
-
-  add_index "onebox_renders", ["url"], :name => "index_onebox_renders_on_url", :unique => true
-
-  create_table "post_action_types", :force => true do |t|
-    t.string   "name_key",   :limit => 50,                    :null => false
-    t.boolean  "is_flag",                  :default => false, :null => false
-    t.string   "icon",       :limit => 20
-    t.datetime "created_at",                                  :null => false
-    t.datetime "updated_at",                                  :null => false
-    t.integer  "position",                 :default => 0,     :null => false
-  end
-
-  create_table "post_actions", :force => true do |t|
-    t.integer  "post_id",             :null => false
-    t.integer  "user_id",             :null => false
-    t.integer  "post_action_type_id", :null => false
-    t.datetime "deleted_at"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-    t.integer  "deleted_by"
-    t.text     "message"
-  end
-
-  add_index "post_actions", ["post_id"], :name => "index_post_actions_on_post_id"
-  add_index "post_actions", ["user_id", "post_action_type_id", "post_id", "deleted_at"], :name => "idx_unique_actions", :unique => true
-
-  create_table "post_onebox_renders", :id => false, :force => true do |t|
-    t.integer  "post_id",          :null => false
-    t.integer  "onebox_render_id", :null => false
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  add_index "post_onebox_renders", ["post_id", "onebox_render_id"], :name => "index_post_onebox_renders_on_post_id_and_onebox_render_id", :unique => true
-
-  create_table "post_replies", :id => false, :force => true do |t|
-    t.integer  "post_id"
-    t.integer  "reply_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "post_replies", ["post_id", "reply_id"], :name => "index_post_replies_on_post_id_and_reply_id", :unique => true
-
-  create_table "post_timings", :id => false, :force => true do |t|
-    t.integer "topic_id",    :null => false
-    t.integer "post_number", :null => false
-    t.integer "user_id",     :null => false
-    t.integer "msecs",       :null => false
-  end
-
-  add_index "post_timings", ["topic_id", "post_number", "user_id"], :name => "post_timings_unique", :unique => true
-  add_index "post_timings", ["topic_id", "post_number"], :name => "post_timings_summary"
-
-  create_table "posts", :force => true do |t|
-    t.integer  "user_id",                                    :null => false
-    t.integer  "topic_id",                                   :null => false
-    t.integer  "post_number",                                :null => false
-    t.text     "raw",                                        :null => false
-    t.text     "cooked",                                     :null => false
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.integer  "reply_to_post_number"
-    t.integer  "cached_version",          :default => 1,     :null => false
-    t.integer  "reply_count",             :default => 0,     :null => false
-    t.integer  "quote_count",             :default => 0,     :null => false
-    t.integer  "reply_below_post_number"
-    t.datetime "deleted_at"
-    t.integer  "off_topic_count",         :default => 0,     :null => false
-    t.integer  "like_count",              :default => 0,     :null => false
-    t.integer  "incoming_link_count",     :default => 0,     :null => false
-    t.integer  "bookmark_count",          :default => 0,     :null => false
-    t.integer  "avg_time"
-    t.float    "score"
-    t.integer  "reads",                   :default => 0,     :null => false
-    t.integer  "post_type",               :default => 1,     :null => false
-    t.integer  "vote_count",              :default => 0,     :null => false
-    t.integer  "sort_order"
-    t.integer  "last_editor_id"
-    t.boolean  "hidden",                  :default => false, :null => false
-    t.integer  "hidden_reason_id"
-    t.integer  "custom_flag_count",       :default => 0,     :null => false
-    t.integer  "spam_count",              :default => 0,     :null => false
-    t.integer  "illegal_count",           :default => 0,     :null => false
-    t.integer  "inappropriate_count",     :default => 0,     :null => false
-    t.datetime "last_version_at",                            :null => false
-  end
-
-  add_index "posts", ["reply_to_post_number"], :name => "index_posts_on_reply_to_post_number"
-  add_index "posts", ["topic_id", "post_number"], :name => "index_posts_on_topic_id_and_post_number", :unique => true
-
-  create_table "posts_search", :id => false, :force => true do |t|
-    t.integer  "id",          :null => false
-    t.tsvector "search_data"
-  end
-
-  add_index "posts_search", ["search_data"], :name => "idx_search_post"
-
-  create_table "site_customizations", :force => true do |t|
-    t.string   "name",                                      :null => false
-    t.text     "stylesheet"
-    t.text     "header"
-    t.integer  "position",                                  :null => false
-    t.integer  "user_id",                                   :null => false
-    t.boolean  "enabled",                                   :null => false
-    t.string   "key",                                       :null => false
-    t.datetime "created_at",                                :null => false
-    t.datetime "updated_at",                                :null => false
-    t.boolean  "override_default_style", :default => false, :null => false
-    t.text     "stylesheet_baked",       :default => "",    :null => false
-  end
-
-  add_index "site_customizations", ["key"], :name => "index_site_customizations_on_key"
-
-  create_table "site_settings", :force => true do |t|
-    t.string   "name",       :null => false
-    t.integer  "data_type",  :null => false
-    t.text     "value"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "topic_allowed_users", :force => true do |t|
-    t.integer  "user_id",    :null => false
-    t.integer  "topic_id",   :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "topic_allowed_users", ["topic_id", "user_id"], :name => "index_topic_allowed_users_on_topic_id_and_user_id", :unique => true
-  add_index "topic_allowed_users", ["user_id", "topic_id"], :name => "index_topic_allowed_users_on_user_id_and_topic_id", :unique => true
-
-  create_table "topic_invites", :force => true do |t|
-    t.integer  "topic_id",   :null => false
-    t.integer  "invite_id",  :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "topic_invites", ["invite_id"], :name => "index_topic_invites_on_invite_id"
-  add_index "topic_invites", ["topic_id", "invite_id"], :name => "index_topic_invites_on_topic_id_and_invite_id", :unique => true
-
-  create_table "topic_link_clicks", :force => true do |t|
-    t.integer  "topic_link_id",              :null => false
-    t.integer  "user_id"
-    t.integer  "ip",            :limit => 8, :null => false
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-  end
-
-  add_index "topic_link_clicks", ["topic_link_id"], :name => "index_forum_thread_link_clicks_on_forum_thread_link_id"
-
-  create_table "topic_links", :force => true do |t|
-    t.integer  "topic_id",                                        :null => false
-    t.integer  "post_id"
-    t.integer  "user_id",                                         :null => false
-    t.string   "url",           :limit => 500,                    :null => false
-    t.string   "domain",        :limit => 100,                    :null => false
-    t.boolean  "internal",                     :default => false, :null => false
-    t.integer  "link_topic_id"
-    t.datetime "created_at",                                      :null => false
-    t.datetime "updated_at",                                      :null => false
-    t.boolean  "reflection",                   :default => false
-    t.integer  "clicks",                       :default => 0,     :null => false
-    t.integer  "link_post_id"
-  end
-
-  add_index "topic_links", ["topic_id", "post_id", "url"], :name => "index_forum_thread_links_on_forum_thread_id_and_post_id_and_url", :unique => true
-  add_index "topic_links", ["topic_id"], :name => "index_forum_thread_links_on_forum_thread_id"
-
-  create_table "topic_users", :id => false, :force => true do |t|
-    t.integer  "user_id",                                     :null => false
-    t.integer  "topic_id",                                    :null => false
-    t.boolean  "starred",                  :default => false, :null => false
-    t.boolean  "posted",                   :default => false, :null => false
-    t.integer  "last_read_post_number"
-    t.integer  "seen_post_count"
-    t.datetime "starred_at"
-    t.datetime "last_visited_at"
-    t.datetime "first_visited_at"
-    t.integer  "notification_level",       :default => 1,     :null => false
-    t.datetime "notifications_changed_at"
-    t.integer  "notifications_reason_id"
-    t.integer  "total_msecs_viewed",       :default => 0,     :null => false
-  end
-
-  add_index "topic_users", ["topic_id", "user_id"], :name => "index_forum_thread_users_on_forum_thread_id_and_user_id", :unique => true
-
-# Could not dump table "topics" because of following StandardError
-#   Unknown type 'hstore' for column 'meta_data'
-
-  create_table "twitter_user_infos", :force => true do |t|
-    t.integer  "user_id",         :null => false
-    t.string   "screen_name",     :null => false
-    t.integer  "twitter_user_id", :null => false
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  add_index "twitter_user_infos", ["twitter_user_id"], :name => "index_twitter_user_infos_on_twitter_user_id", :unique => true
-  add_index "twitter_user_infos", ["user_id"], :name => "index_twitter_user_infos_on_user_id", :unique => true
-
-  create_table "uploads", :force => true do |t|
-    t.integer  "user_id",           :null => false
-    t.integer  "topic_id",          :null => false
-    t.string   "original_filename", :null => false
-    t.integer  "filesize",          :null => false
-    t.integer  "width"
-    t.integer  "height"
-    t.string   "url",               :null => false
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
-  end
-
-  add_index "uploads", ["topic_id"], :name => "index_uploads_on_forum_thread_id"
-  add_index "uploads", ["user_id"], :name => "index_uploads_on_user_id"
-
-  create_table "user_actions", :force => true do |t|
-    t.integer  "action_type",     :null => false
-    t.integer  "user_id",         :null => false
-    t.integer  "target_topic_id"
-    t.integer  "target_post_id"
-    t.integer  "target_user_id"
-    t.integer  "acting_user_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  add_index "user_actions", ["acting_user_id"], :name => "index_actions_on_acting_user_id"
-  add_index "user_actions", ["action_type", "user_id", "target_topic_id", "target_post_id", "acting_user_id"], :name => "idx_unique_rows", :unique => true
-  add_index "user_actions", ["user_id", "action_type"], :name => "index_actions_on_user_id_and_action_type"
-
-  create_table "user_open_ids", :force => true do |t|
-    t.integer  "user_id",    :null => false
-    t.string   "email",      :null => false
-    t.string   "url",        :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.boolean  "active",     :null => false
-  end
-
-  add_index "user_open_ids", ["url"], :name => "index_user_open_ids_on_url"
-
-  create_table "user_visits", :force => true do |t|
-    t.integer "user_id",    :null => false
-    t.date    "visited_at", :null => false
-  end
-
-  add_index "user_visits", ["user_id", "visited_at"], :name => "index_user_visits_on_user_id_and_visited_at", :unique => true
-
-  create_table "users", :force => true do |t|
-    t.string   "username",                      :limit => 20,                     :null => false
-    t.datetime "created_at",                                                      :null => false
-    t.datetime "updated_at",                                                      :null => false
-    t.string   "name"
-    t.text     "bio_raw"
-    t.integer  "seen_notification_id",                         :default => 0,     :null => false
-    t.datetime "last_posted_at"
-    t.string   "email",                         :limit => 256,                    :null => false
-    t.string   "password_hash",                 :limit => 64
-    t.string   "salt",                          :limit => 32
-    t.boolean  "active"
-    t.string   "username_lower",                :limit => 20,                     :null => false
-    t.string   "auth_token",                    :limit => 32
-    t.datetime "last_seen_at"
-    t.string   "website"
-    t.boolean  "admin",                                        :default => false, :null => false
-    t.datetime "last_emailed_at"
-    t.boolean  "email_digests",                                :default => true,  :null => false
-    t.integer  "trust_level",                                                     :null => false
-    t.text     "bio_cooked"
-    t.boolean  "email_private_messages",                       :default => true
-    t.boolean  "email_direct",                                 :default => true,  :null => false
-    t.boolean  "approved",                                     :default => false, :null => false
-    t.integer  "approved_by_id"
-    t.datetime "approved_at"
-    t.integer  "topics_entered",                               :default => 0,     :null => false
-    t.integer  "posts_read_count",                             :default => 0,     :null => false
-    t.integer  "digest_after_days",                            :default => 7,     :null => false
-    t.datetime "previous_visit_at"
-    t.datetime "banned_at"
-    t.datetime "banned_till"
-    t.date     "date_of_birth"
-    t.integer  "auto_track_topics_after_msecs"
-    t.integer  "views",                                        :default => 0,     :null => false
-    t.integer  "flag_level",                                   :default => 0,     :null => false
-    t.integer  "time_read",                                    :default => 0,     :null => false
-    t.integer  "days_visited",                                 :default => 0,     :null => false
-    t.string   "ip_address",                    :limit => nil
-  end
-
-  add_index "users", ["auth_token"], :name => "index_users_on_auth_token"
-  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
-  add_index "users", ["last_posted_at"], :name => "index_users_on_last_posted_at"
-  add_index "users", ["username"], :name => "index_users_on_username", :unique => true
-  add_index "users", ["username_lower"], :name => "index_users_on_username_lower", :unique => true
-
-  create_table "users_search", :id => false, :force => true do |t|
-    t.integer  "id",          :null => false
-    t.tsvector "search_data"
-  end
-
-  add_index "users_search", ["search_data"], :name => "idx_search_user"
-
-  create_table "versions", :force => true do |t|
-    t.integer  "versioned_id"
-    t.string   "versioned_type"
-    t.integer  "user_id"
-    t.string   "user_type"
-    t.string   "user_name"
-    t.text     "modifications"
-    t.integer  "number"
-    t.integer  "reverted_from"
-    t.string   "tag"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  add_index "versions", ["created_at"], :name => "index_versions_on_created_at"
-  add_index "versions", ["number"], :name => "index_versions_on_number"
-  add_index "versions", ["tag"], :name => "index_versions_on_tag"
-  add_index "versions", ["user_id", "user_type"], :name => "index_versions_on_user_id_and_user_type"
-  add_index "versions", ["user_name"], :name => "index_versions_on_user_name"
-  add_index "versions", ["versioned_id", "versioned_type"], :name => "index_versions_on_versioned_id_and_versioned_type"
-
-  create_table "views", :id => false, :force => true do |t|
-    t.integer "parent_id",                 :null => false
-    t.string  "parent_type", :limit => 50, :null => false
-    t.integer "ip",          :limit => 8,  :null => false
-    t.date    "viewed_at",                 :null => false
-    t.integer "user_id"
-  end
-
-  add_index "views", ["parent_id", "parent_type"], :name => "index_views_on_parent_id_and_parent_type"
-
-end
diff --git a/db/structure.sql b/db/structure.sql
index ef3da6df8be..a5252434951 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1242,7 +1242,7 @@ CREATE TABLE categories (
 --
 
 CREATE SEQUENCE categories_id_seq
-    START WITH 1
+    START WITH 5
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -1327,7 +1327,7 @@ CREATE TABLE draft_sequences (
 --
 
 CREATE SEQUENCE draft_sequences_id_seq
-    START WITH 1
+    START WITH 20
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -1361,7 +1361,7 @@ CREATE TABLE drafts (
 --
 
 CREATE SEQUENCE drafts_id_seq
-    START WITH 1
+    START WITH 2
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -1394,7 +1394,7 @@ CREATE TABLE email_logs (
 --
 
 CREATE SEQUENCE email_logs_id_seq
-    START WITH 1
+    START WITH 3
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -1429,7 +1429,7 @@ CREATE TABLE email_tokens (
 --
 
 CREATE SEQUENCE email_tokens_id_seq
-    START WITH 1
+    START WITH 3
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -1642,7 +1642,7 @@ CREATE TABLE onebox_renders (
 --
 
 CREATE SEQUENCE onebox_renders_id_seq
-    START WITH 1
+    START WITH 2
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -1676,7 +1676,7 @@ CREATE TABLE post_action_types (
 --
 
 CREATE SEQUENCE post_action_types_id_seq
-    START WITH 1
+    START WITH 6
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -1807,7 +1807,7 @@ CREATE TABLE posts (
 --
 
 CREATE SEQUENCE posts_id_seq
-    START WITH 1
+    START WITH 16
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -1898,7 +1898,7 @@ CREATE TABLE site_settings (
 --
 
 CREATE SEQUENCE site_settings_id_seq
-    START WITH 1
+    START WITH 4
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -1930,7 +1930,7 @@ CREATE TABLE topic_allowed_users (
 --
 
 CREATE SEQUENCE topic_allowed_users_id_seq
-    START WITH 1
+    START WITH 3
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -2122,7 +2122,7 @@ CREATE TABLE topics (
 --
 
 CREATE SEQUENCE topics_id_seq
-    START WITH 1
+    START WITH 16
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -2228,7 +2228,7 @@ CREATE TABLE user_actions (
 --
 
 CREATE SEQUENCE user_actions_id_seq
-    START WITH 1
+    START WITH 40
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -2292,7 +2292,7 @@ CREATE TABLE user_visits (
 --
 
 CREATE SEQUENCE user_visits_id_seq
-    START WITH 1
+    START WITH 4
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -2358,7 +2358,7 @@ CREATE TABLE users (
 --
 
 CREATE SEQUENCE users_id_seq
-    START WITH 1
+    START WITH 3
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
diff --git a/lib/mothership.rb b/lib/mothership.rb
index e5e78edccf0..26a126fdc01 100644
--- a/lib/mothership.rb
+++ b/lib/mothership.rb
@@ -19,10 +19,20 @@ module Mothership
     if json.has_key?('success')
       true
     else
-      raise NicknameUnavailable  # json['failed'] == -200
+      raise NicknameUnavailable  # TODO: report ALL the errors
     end
   end
 
+  def self.change_nickname(current_nickname, new_nickname)
+    json = put("/users/#{current_nickname}/nickname", {nickname: new_nickname})
+    if json.has_key?('success')
+      true
+    else
+      raise NicknameUnavailable  # TODO: report ALL the errors
+    end
+  end
+
+
   def self.current_discourse_version
     get('/current_version')['version']
   end
@@ -40,6 +50,11 @@ module Mothership
     JSON.parse(response)
   end
 
+  def self.put(rel_url, params={})
+    response = RestClient.put( "#{mothership_base_url}#{rel_url}", {access_token: access_token}.merge(params), content_type: :json, accept: accepts )
+    JSON.parse(response)
+  end
+
   def self.mothership_base_url
     if Rails.env == 'production'
       'http://api.discourse.org/api'
diff --git a/lib/search.rb b/lib/search.rb
index e91486da791..b6ebf70de52 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -100,7 +100,7 @@ module Search
 
       db_result = []
       [user_query_sql, category_query_sql, topic_query_sql].each do |sql|
-        sql << " limit " << Search.per_facet.to_s
+        sql << " LIMIT " << Search.per_facet.to_s
         db_result += ActiveRecord::Base.exec_sql(sql , query: terms.join(" & ")).to_a
       end
     end
@@ -109,12 +109,14 @@ module Search
     
     expected_topics = 0
     expected_topics = Search.facets.size unless type_filter.present?
-    expected_topics = Search.per_facet * Search.facets.size if type_filter == 'topic' 
+    expected_topics = Search.per_facet * Search.facets.size if type_filter == 'topic'
+    
     if expected_topics > 0 
       db_result.each do |row|
         expected_topics -= 1 if row['type'] == 'topic'
       end
     end
+    
     if expected_topics > 0 
       tmp = ActiveRecord::Base.exec_sql "#{post_query_sql} limit :per_facet", 
         query: terms.join(" & "), per_facet: expected_topics * 3
@@ -134,11 +136,9 @@ module Search
       db_result += tmp[0..expected_topics-1]
     end
 
-
     # Group the results by type
     grouped = {}
     db_result.each do |row|
-
       type = row.delete('type')
 
       # Add the slug for topics
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index cd4cbea2165..e5ad0f5fdcc 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -3,10 +3,10 @@ require_dependency 'topic_query'
 
 class TopicView
 
-  attr_accessor :topic, :min, :max, :draft, :draft_key, :draft_sequence
+  attr_accessor :topic, :min, :max, :draft, :draft_key, :draft_sequence, :posts
 
   def initialize(topic_id, user=nil, options={})
-    @topic = Topic.where(id: topic_id).includes(:category).first
+    @topic = find_topic(topic_id)
     raise Discourse::NotFound if @topic.blank?
 
     # Special case: If the topic is private and the user isn't logged in, ask them
@@ -15,11 +15,11 @@ class TopicView
       raise Discourse::NotLoggedIn.new
     end
 
-    Guardian.new(user).ensure_can_see!(@topic)    
+    Guardian.new(user).ensure_can_see!(@topic)
     @min, @max = 1, SiteSetting.posts_per_page
+    @post_number, @page  = options[:post_number], options[:page]
     @posts = @topic.posts
 
-    
     @posts = @posts.with_deleted if user.try(:admin?)
     @posts = @posts.best_of if options[:best_of].present?
 
@@ -31,20 +31,62 @@ class TopicView
     @user = user
     @initial_load = true
 
+    filter_posts(options)
+
+    @draft_key = @topic.draft_key
+    @draft_sequence = DraftSequence.current(user, @draft_key)
+  end
+
+  def canonical_path
+    path = @topic.relative_url
+    path << if @post_number
+      page = ((@post_number.to_i - 1) / SiteSetting.posts_per_page) + 1
+      (page > 1) ? "?page=#{page}" : ""
+    else
+      (@page && @page.to_i > 1) ? "?page=#{@page}" : ""
+    end
+    path
+  end
+
+  def next_page
+    last_post = @posts.last
+    if last_post.present? and (@topic.highest_post_number > last_post.post_number)
+      (@posts[0].post_number / SiteSetting.posts_per_page) + 1
+    end
+  end
+
+  def next_page_path
+    "#{@topic.relative_url}?page=#{next_page}"
+  end
+
+  def relative_url
+    @topic.relative_url
+  end
+
+  def title
+    @topic.title
+  end
+
+  def filter_posts(opts = {})
+    if opts[:post_number].present?
+      # Get posts near a post
+      filter_posts_near(opts[:post_number].to_i)
+    elsif opts[:posts_before].present?
+      filter_posts_before(opts[:posts_before].to_i)
+    elsif opts[:posts_after].present?
+      filter_posts_after(opts[:posts_after].to_i)
+    else
+      # No filter? Consider it a paged view, default to page 0 which is the first segment
+      filter_posts_paged(opts[:page].to_i)
+    end
   end
 
   # Filter to all posts near a particular post number
   def filter_posts_near(post_number)
-    @min, @max = post_range(post_number)  
+    @min, @max = post_range(post_number)
     filter_posts_in_range(@min, @max)
   end
 
-  def filter_posts_in_range(min, max)
-    @min, @max = min, max 
-    @posts = @posts.where("post_number between ? and ?", @min, @max).includes(:user).regular_order
-  end
-
-
   def post_numbers
     @post_numbers ||= @posts.order(:post_number).pluck(:post_number)
   end
@@ -55,7 +97,7 @@ class TopicView
     max = min + SiteSetting.posts_per_page
 
     max_val = (post_numbers.length - 1)
-    
+
     # If we're off the charts, return nil
     return nil if min > max_val
 
@@ -71,9 +113,9 @@ class TopicView
     @max = post_number - 1
 
     @posts = @posts.reverse_order.where("post_number < ?", post_number)
-    @posts = @posts.includes(:topic).joins(:user).limit(SiteSetting.posts_per_page)      
+    @posts = @posts.includes(:topic).joins(:user).limit(SiteSetting.posts_per_page)
     @min = @max - @posts.size
-    @min = 1 if @min < 1      
+    @min = 1 if @min < 1
   end
 
   # Filter to all posts after a particular post number
@@ -81,12 +123,8 @@ class TopicView
     @initial_load = false
     @min = post_number
     @posts = @posts.regular_order.where("post_number > ?", post_number)
-    @posts = @posts.includes(:topic).joins(:user).limit(SiteSetting.posts_per_page)      
-    @max = @min + @posts.size      
-  end
-
-  def posts
-    @posts
+    @posts = @posts.includes(:topic).joins(:user).limit(SiteSetting.posts_per_page)
+    @max = @min + @posts.size
   end
 
   def read?(post_number)
@@ -117,7 +155,7 @@ class TopicView
   end
 
   def voted_in_topic?
-    return false 
+    return false
 
     # all post_actions is not the way to do this, cut down on the query, roll it up into topic if we need it
 
@@ -171,7 +209,7 @@ class TopicView
       min_idx = 0 if min_idx < 0
     end
 
-    [post_numbers[min_idx], post_numbers[max_idx]]    
+    [post_numbers[min_idx], post_numbers[max_idx]]
   end
 
   # Are we the initial page load? If so, we can return extra information like
@@ -187,20 +225,30 @@ class TopicView
 
   protected
 
-    def read_posts_set
-      @read_posts_set ||= begin
-        result = Set.new
-        return result unless @user.present?
-        return result unless topic_user.present?
+  def read_posts_set
+    @read_posts_set ||= begin
+      result = Set.new
+      return result unless @user.present?
+      return result unless topic_user.present?
 
-        posts_max = @max > (topic_user.last_read_post_number || 1 ) ? (topic_user.last_read_post_number || 1) : @max
+      posts_max = @max > (topic_user.last_read_post_number || 1 ) ? (topic_user.last_read_post_number || 1) : @max
 
-        PostTiming.select(:post_number)
-                  .where("topic_id = ? AND user_id = ? AND post_number BETWEEN ? AND ?", 
-                         @topic.id, @user.id, @min, posts_max)
-                  .each {|t| result << t.post_number}      
-        result        
-      end
+      PostTiming.select(:post_number)
+                .where("topic_id = ? AND user_id = ? AND post_number BETWEEN ? AND ?", 
+                       @topic.id, @user.id, @min, posts_max)
+                .each {|t| result << t.post_number}
+      result
     end
+  end
 
+  private
+
+  def filter_posts_in_range(min, max)
+    @min, @max = min, max
+    @posts = @posts.where("post_number between ? and ?", @min, @max).includes(:user).regular_order
+  end
+
+  def find_topic(topic_id)
+    Topic.where(id: topic_id).includes(:category).first
+  end
 end
diff --git a/spec/components/mothership_spec.rb b/spec/components/mothership_spec.rb
index cd8575e8b6a..9b2a2ec3bd6 100644
--- a/spec/components/mothership_spec.rb
+++ b/spec/components/mothership_spec.rb
@@ -61,4 +61,34 @@ describe Mothership do
       Mothership.current_discourse_version().should == 1.0
     end
   end
+
+  describe '#change_nickname' do
+    it 'should return true when nickname is changed successfully' do
+      RestClient.stubs(:put).returns( {success: 'OK'}.to_json )
+      Mothership.change_nickname('MacGyver', 'MacG').should be_true
+    end
+
+    it 'should return raise NicknameUnavailable when nickname is not available' do
+      RestClient.stubs(:put).returns( {failed: -200}.to_json )
+      expect {
+        Mothership.change_nickname('MacGyver', 'MacG')
+      }.to raise_error(Mothership::NicknameUnavailable)
+    end
+
+    # TODO: General error handling in mothership.rb
+
+    # it 'should return raise NicknameUnavailable when nickname does not belong to this forum' do
+    #   RestClient.stubs(:put).returns( {failed: -13}.to_json )
+    #   expect {
+    #     Mothership.change_nickname('MacGyver', 'MacG')
+    #   }.to raise_error(Mothership::ActionForbidden)
+    # end
+
+    # it 'should return raise NicknameUnavailable when nickname does not belong to this forum' do
+    #   RestClient.stubs(:put).returns( {failed: -13}.to_json )
+    #   expect {
+    #     Mothership.change_nickname('MacGyver', 'MacG')
+    #   }.to raise_error(Mothership::ActionForbidden)
+    # end
+  end
 end
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index c32ec01fcaa..ef6814330ab 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -26,6 +26,62 @@ describe TopicView do
     lambda { TopicView.new(topic.id, nil) }.should raise_error(Discourse::NotLoggedIn)
   end
 
+  describe "#get_canonical_path" do
+    let(:user) { Fabricate(:user) }
+    let(:topic) { Fabricate(:topic) }
+    let(:path) { "/1234" }
+
+    before do
+      topic.expects(:relative_url).returns(path)
+      described_class.any_instance.expects(:find_topic).with(1234).returns(topic)
+    end
+
+    context "without a post number" do
+      context "without a page" do
+        it "generates a canonical path for a topic" do
+          described_class.new(1234, user).canonical_path.should eql(path)
+        end
+      end
+
+      context "with a page" do
+        let(:path_with_page) { "/1234?page=5" }
+
+        it "generates a canonical path for a topic" do
+          described_class.new(1234, user, page: 5).canonical_path.should eql(path_with_page)
+        end
+      end
+    end
+    context "with a post number" do
+      let(:path_with_page) { "/1234?page=10" }
+      before { SiteSetting.stubs(:posts_per_page).returns(5) }
+
+      it "generates a canonical path for a topic" do
+        described_class.new(1234, user, post_number: 50).canonical_path.should eql(path_with_page)
+      end
+    end
+  end
+
+  describe "#next_page" do
+    let(:posts) { [stub(post_number: 1), stub(post_number: 2)] }
+    let(:topic) do
+      topic = Fabricate(:topic)
+      topic.stubs(:posts).returns(posts)
+      topic.stubs(:highest_post_number).returns(5)
+      topic
+    end
+    let(:user) { Fabricate(:user) }
+
+    before do
+      described_class.any_instance.expects(:find_topic).with(1234).returns(topic)
+      described_class.any_instance.stubs(:filter_posts)
+      SiteSetting.stubs(:posts_per_page).returns(2)
+    end
+
+    it "should return the next page" do
+      described_class.new(1234, user).next_page.should eql(1)
+    end
+  end
+
   context '.posts_count' do
     it 'returns the two posters with their counts' do
       topic_view.posts_count.to_a.should =~ [[first_poster.id, 2], [coding_horror.id, 1]]
@@ -111,29 +167,24 @@ describe TopicView do
   context '.posts' do
     context 'near a post_number' do
 
-      context 'with a valid post_number' do
-        before do
-          topic.reload
-          topic_view.filter_posts_near(p2.post_number)
-        end
+      let (:near_topic_view) { TopicView.new(topic.id, coding_horror, post_number: p2.post_number) }
 
-        it 'returns posts around a post number' do
-          topic_view.posts.should == [p1, p2, p3]
-        end
-
-        it 'has a min of the 1st post number' do
-          topic_view.min.should == p1.post_number
-        end
-
-        it 'has a max of the 3rd post number' do
-          topic_view.max.should == p3.post_number
-        end
-
-        it 'is the inital load' do
-          topic_view.should be_initial_load
-        end       
+      it 'returns posts around a post number' do
+        near_topic_view.posts.should == [p1, p2, p3]
       end
 
+      it 'has a min of the 1st post number' do
+        near_topic_view.min.should == p1.post_number
+      end
+
+      it 'has a max of the 3rd post number' do
+        near_topic_view.max.should == p3.post_number
+      end
+
+      it 'is the inital load' do
+        near_topic_view.should be_initial_load
+      end       
+
     end
 
     context 'before a post_number' do
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index f6bac266fdc..d4c4b38d6ab 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -267,15 +267,9 @@ describe TopicsController do
 
       it "reviews the user for a promotion if they're new" do
         user.update_column(:trust_level, TrustLevel.Levels[:new])
-        promotion.expects(:review)
+        Promotion.any_instance.expects(:review)
         get :show, id: topic.id
       end
-
-      it "doesn't reviews the user for a promotion if they're basic" do
-        promotion.expects(:review).never
-        get :show, id: topic.id
-      end      
-
     end
 
     context 'filters' do
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index fd0d6ede64d..76383c63c41 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -379,6 +379,28 @@ describe UsersController do
       let(:create_params) { {:name => @user.name, :username => @user.username, :password => "strongpassword", :email => @user.email, :challenge => 'abc'} }
       it_should_behave_like 'honeypot fails'
     end
+
+    shared_examples_for 'failed signup due to password problem' do
+      it 'should not create a new User' do
+        expect { xhr :post, :create, create_params }.to_not change { User.count }
+      end
+
+      it 'should report failed' do
+        xhr :post, :create, create_params
+        json = JSON::parse(response.body)
+        json["success"].should_not be_true
+      end
+    end
+
+    context 'when password is blank' do
+      let(:create_params) { {:name => @user.name, :username => @user.username, :password => "", :email => @user.email} }
+      it_should_behave_like 'failed signup due to password problem'
+    end
+
+    context 'when password param is missing' do
+      let(:create_params) { {:name => @user.name, :username => @user.username, :email => @user.email} }
+      it_should_behave_like 'failed signup due to password problem'
+    end
   end
 
   context '.username' do
diff --git a/spec/models/post_alert_observer_spec.rb b/spec/models/post_alert_observer_spec.rb
index 7b6ad2cf35c..0daed2202c3 100644
--- a/spec/models/post_alert_observer_spec.rb
+++ b/spec/models/post_alert_observer_spec.rb
@@ -37,11 +37,6 @@ describe PostAlertObserver do
 
 
   context 'quotes' do
-    it 'notifies a user by display username' do
-      lambda {
-        Fabricate(:post, raw: '[quote="Evil Trout, post:1"]whatup[/quote]')
-      }.should change(evil_trout.notifications, :count).by(1)
-    end      
 
     it 'notifies a user by username' do
       lambda {
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 88c943ec0ca..146a51599f8 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -86,7 +86,8 @@ describe Post do
     let(:post_no_images) { Fabricate.build(:post, post_args) }
     let(:post_one_image) { Fabricate.build(:post, post_args.merge(raw: "![sherlock](http://bbc.co.uk/sherlock.jpg)")) }
     let(:post_two_images) { Fabricate.build(:post, post_args.merge(raw: "<img src='http://discourse.org/logo.png'> <img src='http://bbc.co.uk/sherlock.jpg'>")) }
-    let(:post_with_emoticons) { Fabricate.build(:post, post_args.merge(raw: '<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="emoji"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="emoji">')) }
+    let(:post_with_avatars) { Fabricate.build(:post, post_args.merge(raw: '<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="avatar"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="avatar">')) }
+    let(:post_with_two_classy_images) { Fabricate.build(:post, post_args.merge(raw: "<img src='http://discourse.org/logo.png' class='classy'> <img src='http://bbc.co.uk/sherlock.jpg' class='classy'>")) }
 
     it "returns 0 images for an empty post" do
       Fabricate.build(:post).image_count.should == 0
@@ -100,10 +101,14 @@ describe Post do
       post_two_images.image_count.should == 2
     end
 
-    it "doesn't count emoticons as images" do
-      post_with_emoticons.image_count.should == 0
+    it "doesn't count avatars as images" do
+      post_with_avatars.image_count.should == 0
     end
 
+    it "doesn't count whitelisted images" do
+      Post.stubs(:white_listed_image_classes).returns(["classy"]) 
+      post_with_two_classy_images.image_count.should == 0
+    end
 
     context "validation" do
       it "allows a new user to make a post with one image" do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 3e518ce38ef..8b46184b342 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -638,7 +638,7 @@ describe User do
       it 'should return false' do
         user.email_tokens.each {|t| t.destroy}
         user.reload
-        user.email_confirmed?.should be_false
+        user.email_confirmed?.should be_true
       end
     end
   end
diff --git a/vendor/gems/discourse_emoji/lib/discourse_emoji/engine.rb b/vendor/gems/discourse_emoji/lib/discourse_emoji/engine.rb
index 3944406a357..5caafd703d2 100644
--- a/vendor/gems/discourse_emoji/lib/discourse_emoji/engine.rb
+++ b/vendor/gems/discourse_emoji/lib/discourse_emoji/engine.rb
@@ -9,8 +9,9 @@ module DiscourseEmoji
 
       app.config.after_initialize do 
         DiscoursePluginRegistry.setup(DiscourseEmoji::Plugin)
+        Post.white_listed_image_classes << "emoji"
       end
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/gems/message_bus/lib/message_bus.rb b/vendor/gems/message_bus/lib/message_bus.rb
index 7b3fefc09df..514e6f2001b 100644
--- a/vendor/gems/message_bus/lib/message_bus.rb
+++ b/vendor/gems/message_bus/lib/message_bus.rb
@@ -10,6 +10,7 @@ require "message_bus/client"
 require "message_bus/connection_manager"
 require "message_bus/message_handler"
 require "message_bus/rack/middleware"
+require "message_bus/rack/diagnostics"
 
 # we still need to take care of the logger
 if defined?(::Rails)
@@ -71,19 +72,28 @@ module MessageBus::Implementation
   end
 
   def site_id_lookup(&blk)
-    @site_id_lookup ||= blk
+    @site_id_lookup = blk if blk
+    @site_id_lookup
   end
 
   def user_id_lookup(&blk)
-    @user_id_lookup ||= blk
+    @user_id_lookup = blk if blk
+    @user_id_lookup
+  end
+
+  def is_admin_lookup(&blk)
+    @is_admin_lookup = blk if blk
+    @is_admin_lookup
   end
 
   def on_connect(&blk)
-    @on_connect ||= blk
+    @on_connect = blk if blk
+    @on_connect
   end
 
   def on_disconnect(&blk)
-    @on_disconnect ||= blk
+    @on_disconnect = blk if blk
+    @on_disconnect
   end
 
   def allow_broadcast=(val)
diff --git a/vendor/gems/message_bus/lib/message_bus/rack/diagnostics.rb b/vendor/gems/message_bus/lib/message_bus/rack/diagnostics.rb
new file mode 100644
index 00000000000..09426227884
--- /dev/null
+++ b/vendor/gems/message_bus/lib/message_bus/rack/diagnostics.rb
@@ -0,0 +1,35 @@
+module MessageBus::Rack; end
+
+class MessageBus::Rack::Diagnostics
+  def initialize(app, config = {})
+    @app = app
+  end
+
+  def index
+    html = <<HTML
+<!DOCTYPE html>
+<html>
+  <head></head>
+  <body>
+    <h2>Message Bus Diags</h2>
+  </body>
+</html>
+HTML
+    return [200, {"content-type" => "text/html;"}, html]
+  end
+
+  def call(env)
+
+    return @app.call(env) unless env['PATH_INFO'].start_with? '/message-bus/_diagnostics'
+
+    route = env['PATH_INFO'].split('/message_bus/_diagnostics')[1]
+    
+    if MessageBus.is_admin_lookup.nil? || !MessageBus.is_admin_lookup.call
+      return [403, {}, ["not allowed"]]
+    end
+
+    return index unless route
+    
+    return [404, {}, ["not found"]]
+  end
+end
diff --git a/vendor/gems/message_bus/lib/message_bus/rack/middleware.rb b/vendor/gems/message_bus/lib/message_bus/rack/middleware.rb
index 7f9e0ec402f..f240266a4f0 100644
--- a/vendor/gems/message_bus/lib/message_bus/rack/middleware.rb
+++ b/vendor/gems/message_bus/lib/message_bus/rack/middleware.rb
@@ -46,6 +46,11 @@ class MessageBus::Rack::Middleware
         return [200,{"Content-Type" => "text/html"},["sent"]]
     end
 
+    if env['PATH_INFO'].start_with? '/message-bus/_diagnostics' 
+      diags = MessageBus::Rack::Diagnostics.new(@app)
+      return diags.call(env)
+    end
+
     client_id = env['PATH_INFO'].split("/")[2]
     return [404, {}, ["not found"]] unless client_id
 
diff --git a/vendor/gems/message_bus/spec/lib/middleware_spec.rb b/vendor/gems/message_bus/spec/lib/middleware_spec.rb
index 1d7bd279797..65306cf5c65 100644
--- a/vendor/gems/message_bus/spec/lib/middleware_spec.rb
+++ b/vendor/gems/message_bus/spec/lib/middleware_spec.rb
@@ -107,11 +107,22 @@ describe MessageBus::Rack::Middleware do
       ensure
         MessageBus.long_polling_interval = 5000
       end
-
-
     end
   end
 
+  describe "diagnostics" do 
+
+    it "should return a 403 if a user attempts to get at the _diagnostics path" do 
+      get "/message-bus/_diagnostics"
+      last_response.status.should == 403
+    end
+
+    it "should get a 200 with html for an authorized user" do
+      MessageBus.stub(:is_admin_lookup).and_return(lambda{ true })
+      get "/message-bus/_diagnostics"
+      last_response.status.should == 200
+    end
+  end
   
   describe "polling" do
     before do