diff --git a/application/admin/component/application/dispatcher/http.php b/application/admin/component/application/dispatcher/http.php
index 5dd309c19..3983ded77 100644
--- a/application/admin/component/application/dispatcher/http.php
+++ b/application/admin/component/application/dispatcher/http.php
@@ -303,7 +303,7 @@ public function loadLanguage(Library\CommandContext $context)
         $languages->setActive($language);
 
         // TODO: Remove this.
-        JFactory::getConfig()->setValue('config.language', $language->iso_code);
+        //JFactory::getConfig()->setValue('config.language', $language->iso_code);
     }
 
     /**
diff --git a/application/admin/component/categories/view/categories/templates/list.html.php b/application/admin/component/categories/view/categories/templates/list.html.php
index 55044508e..e4201be1b 100644
--- a/application/admin/component/categories/view/categories/templates/list.html.php
+++ b/application/admin/component/categories/view/categories/templates/list.html.php
@@ -11,7 +11,7 @@
 <ul class="navigation">
 	<li>
         <a class="<?= $state->category == null ? 'active' : ''; ?>" href="<?= route('category=' ) ?>">
-            <?= 'All categories' ?>
+            <?= translate('All categories') ?>
         </a>
 	</li>
 	<? foreach ($categories as $category) : ?>
diff --git a/component/ckeditor/resources/assets/js/ckeditor.koowa.js b/component/ckeditor/resources/assets/js/ckeditor.koowa.js
new file mode 100644
index 000000000..957cceaeb
--- /dev/null
+++ b/component/ckeditor/resources/assets/js/ckeditor.koowa.js
@@ -0,0 +1,30 @@
+if(!Koowa) var Koowa = {};
+
+Koowa.Controller.Form = new Class({
+
+    Extends: Koowa.Controller,
+
+    _action_default: function(action, data, novalidate){
+        if(!novalidate && !this.fireEvent('validate')) {
+            return false;
+        }
+
+        // Don't validate if novalidate is set
+        if(!novalidate){
+            // Loop through all the editor intances
+            // See: http://ckeditor.com/forums/CKEditor-3.x/Getting-CKEDITOR-instance
+            for(var i in CKEDITOR.instances) {
+
+                element = document.getElementById(CKEDITOR.instances[i].name);
+
+                // If any instance is empty then abort the save action
+                if(!CKEDITOR.instances[i].getData() && element.classList.contains('ckeditor-required')) {
+                    return false;
+                }
+            }
+        }
+
+        this.form.adopt(new Element('input', {name: '_action', type: 'hidden', value: action}));
+        this.form.submit();
+    }
+});
\ No newline at end of file
diff --git a/component/ckeditor/view/editor/templates/default.html.php b/component/ckeditor/view/editor/templates/default.html.php
index c79cdc936..efda17048 100644
--- a/component/ckeditor/view/editor/templates/default.html.php
+++ b/component/ckeditor/view/editor/templates/default.html.php
@@ -9,6 +9,7 @@
 ?>
 
 <script src="assets://ckeditor/ckeditor/ckeditor.js" />
+<script src="assets://ckeditor/js/ckeditor.koowa.js" />
 
 <script>
     jQuery(document).ready(function() {
@@ -26,4 +27,4 @@
     });
 </script>
 
-<textarea id="<?= $id ?>" name="<?= $name ?>" class="ckeditor editable-<?= $id ?> validate-editor" style="visibility:hidden"><?= $text ?></textarea>
+<textarea id="<?= $id ?>" name="<?= $name ?>" class="ckeditor editable-<?= $id ?> validate-editor <?= $class ?>" style="visibility:hidden"><?= $text ?></textarea>
diff --git a/install/vagrant/puppet/manifests/default.pp b/install/vagrant/puppet/manifests/default.pp
deleted file mode 100644
index 0a9e5176d..000000000
--- a/install/vagrant/puppet/manifests/default.pp
+++ /dev/null
@@ -1,249 +0,0 @@
-group { 'puppet': ensure => present }
-Exec { path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/' ] }
-File { owner => 0, group => 0, mode => 0644, backup => true }
-
-class {'apt':
-  always_apt_update => true,
-}
-
-Class['::apt::update'] -> Package <|
-    title != 'python-software-properties'
-and title != 'software-properties-common'
-|>
-
-apt::key { '4F4EA0AAE5267A6C': }
-
-apt::ppa { 'ppa:ondrej/php5-oldstable':
-  require => Apt::Key['4F4EA0AAE5267A6C']
-}
-
-apt::source { 'nginx':
-  location => 'http://ppa.launchpad.net/sandyd/nginx-current-pagespeed/ubuntu',
-  key      => '5626E4A6F2F46C93'
-}
-
-apt::source { 'mariadb':
-  location => 'http://mariadb.cu.be//repo/5.5/ubuntu',
-  key      => 'cbcb082a1bb943db',
-}
-    
-class { 'puphpet::dotfiles': }
-
-package { [
-    'build-essential',
-    'vim',
-    'curl',
-    'git-core',
-    'unzip'
-  ]:
-  ensure  => 'installed',
-}
-
-file { '/var/cache/nginx':
-  ensure => directory,
-  mode   => '0644',
-  group  => 'root',
-  owner  => 'root'
-}
-
-file { '/var/cache/nginx/pagespeed':
-  ensure => directory,
-  mode   => '0644',
-  group  => 'root',
-  owner  => 'root',
-  require => File['/var/cache/nginx']
-}
-
-class { 'nginx':
-  require => File['/var/cache/nginx/pagespeed']
-}
-
-file { "${nginx::config::nx_temp_dir}/nginx.d/nooku-001":
-  ensure  => file,
-  content => template('nginx/vhost/nooku.erb'),
-  notify  => Class['nginx::service'],
-}
-
-class { 'php':
-  package             => 'php5-fpm',
-  service             => 'php5-fpm',
-  service_autorestart => false,
-  config_file         => '/etc/php5/fpm/php.ini',
-  module_prefix       => ''
-}
-
-php::module {
-  [
-    'php5-mysql',
-    'php5-cli',
-    'php5-curl',
-    'php5-gd',
-    'php5-intl',
-    'php5-mcrypt',
-    'php-apc',
-  ]:
-  service => 'php5-fpm',
-}
-
-service { 'php5-fpm':
-  ensure     => running,
-  enable     => true,
-  hasrestart => true,
-  hasstatus  => true,
-  require    => Package['php5-fpm'],
-}
-
-class { 'php::devel':
-  require => Class['php'],
-}
-
-file { '/etc/php5/fpm/pool.d/www.conf':
-  source  => 'puppet:///modules/php/www.conf',
-  require => Class['php'],
-  notify  => Service['php5-fpm']
-}
-
-class { 'xdebug':
-  service => 'nginx',
-}
-
-# Install Xdebug but disable it by default since it's super slow
-file { '/etc/php5/cli/conf.d/20-xdebug.ini':
-  ensure => absent,
-  notify  => Service['php5-fpm'],
-  require => [Class['nginx'], Class['php']],
-}
-
-class { 'composer':
-  require => Package['php5-fpm', 'curl'],
-}
-
-puphpet::ini { 'php':
-  value   => [
-    'date.timezone = "UTC"'
-  ],
-  ini     => '/etc/php5/conf.d/zzz_php.ini',
-  notify  => Service['php5-fpm'],
-  require => Class['php'],
-}
-
-puphpet::ini { 'custom':
-  value   => [
-    'sendmail_path = /usr/bin/env catchmail -fnoreply@example.com',
-    'display_errors = On',
-    'error_reporting = E_ALL & ~E_STRICT',
-    'upload_max_filesize = "256M"',
-    'post_max_size = "256M"',
-    'memory_limit = "128M"'
-  ],
-  ini     => '/etc/php5/conf.d/zzz_custom.ini',
-  notify  => Service['php5-fpm'],
-  require => Class['php'],
-}
-
-puphpet::ini { 'xdebug':
-  value   => [
-  'xdebug.remote_autostart = 0',
-  'xdebug.remote_connect_back = 1',
-  'xdebug.remote_enable = 1',
-  'xdebug.remote_handler = "dbgp"',
-  'xdebug.remote_port = 9000',
-  'xdebug.remote_host = "192.168.50.1"',
-  'xdebug.show_local_vars = 0',
-  'xdebug.profiler_enable = 0',
-  'xdebug.profiler_enable_trigger = 1',
-  'xdebug.max_nesting_level = 1000'
-  ],
-  ini     => '/etc/php5/conf.d/zzz_xdebug.ini',
-  notify  => Service['php5-fpm'],
-  require => Class['php'],
-}
-
-class { 'mysql::server':
-  config_hash   => {
-    'root_password' => 'root',
-    'bind_address' => false,
-  },
-  package_name => 'mariadb-server'
-}
-
-exec { 'grant-all-to-root':
-  command     => "mysql --user='root' --password='root' --execute=\"GRANT ALL ON *.* TO 'root'@'%' IDENTIFIED BY 'root' WITH GRANT OPTION;\"",
-  require => Class['phpmyadmin']
-}
-
-class { 'phpmyadmin':
-  require => [Class['mysql::server'], Class['mysql::config'], Class['php']],
-}
-
-nginx::resource::vhost { 'phpmyadmin.nooku.dev':
-  ensure      => present,
-  server_name => ['phpmyadmin.nooku.dev'],
-  listen_port => 80,
-  index_files => ['index.php'],
-  www_root    => '/usr/share/phpmyadmin',
-  try_files   => ['$uri', '$uri/', '/index.php?$args'],
-  require     => Class['phpmyadmin'],
-}
-
-nginx::resource::location { "phpmyadmin-php":
-  ensure              => 'present',
-  vhost               => 'phpmyadmin.nooku.dev',
-  location            => '~ \.php$',
-  proxy               => undef,
-  try_files           => ['$uri', '$uri/', '/index.php?$args'],
-  www_root            => '/usr/share/phpmyadmin',
-  location_cfg_append => {
-    'fastcgi_split_path_info' => '^(.+\.php)(/.+)$',
-    'fastcgi_param'           => 'PATH_INFO $fastcgi_path_info',
-    'fastcgi_param '          => 'PATH_TRANSLATED $document_root$fastcgi_path_info',
-    'fastcgi_param  '         => 'SCRIPT_FILENAME $document_root$fastcgi_script_name',
-    'fastcgi_pass'            => 'unix:/var/run/php5-fpm.sock',
-    'fastcgi_index'           => 'index.php',
-    'include'                 => 'fastcgi_params'
-  },
-  notify              => Class['nginx::service'],
-  require             => Nginx::Resource::Vhost['phpmyadmin.nooku.dev'],
-}
-
-class { 'mailcatcher': }
-
-class { 'less': }
-
-class { 'uglifyjs': }
-
-class { 'scripts': }
-
-class { 'webgrind':
-  require => Package['unzip'],
-}
-
-nginx::resource::vhost { 'webgrind.nooku.dev':
-  ensure      => present,
-  server_name => ['webgrind.nooku.dev'],
-  listen_port => 80,
-  index_files => ['index.php'],
-  www_root    => '/usr/share/webgrind',
-  try_files   => ['$uri', '$uri/', '/index.php?$args'],
-  require     => Class['webgrind'],
-}
-
-nginx::resource::location { "webgrind-php":
-  ensure              => 'present',
-  vhost               => 'webgrind.nooku.dev',
-  location            => '~ \.php$',
-  proxy               => undef,
-  try_files           => ['$uri', '$uri/', '/index.php?$args'],
-  www_root            => '/usr/share/webgrind',
-  location_cfg_append => {
-  'fastcgi_split_path_info' => '^(.+\.php)(/.+)$',
-  'fastcgi_param'           => 'PATH_INFO $fastcgi_path_info',
-  'fastcgi_param '          => 'PATH_TRANSLATED $document_root$fastcgi_path_info',
-  'fastcgi_param  '         => 'SCRIPT_FILENAME $document_root$fastcgi_script_name',
-  'fastcgi_pass'            => 'unix:/var/run/php5-fpm.sock',
-  'fastcgi_index'           => 'index.php',
-  'include'                 => 'fastcgi_params'
-  },
-  notify              => Class['nginx::service'],
-  require             => Nginx::Resource::Vhost['webgrind.nooku.dev'],
-}