From ca35a7ca816dc0d08627f1725eb753d4db0e29e8 Mon Sep 17 00:00:00 2001
From: Mike Kusold <git@mikekusold.com>
Date: Sun, 7 Jun 2015 22:27:57 -0600
Subject: [PATCH 1/5] Adding more power for vagrant

---
 Vagrantfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index c0fb32fe35..a1fd4f80aa 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,6 +6,8 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provider "virtualbox" do |v|
+    v.memory = 2048
+    v.cpus = 2
     v.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"]
   end
   config.vm.box = "thepeopleseason/habitrpg"

From 5ab3a80b57c3c168b21e825fb819eb5e89a372dd Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Sun, 21 Jun 2015 17:49:59 -0500
Subject: [PATCH 2/5] Closes #5360

---
 website/views/static/front.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/views/static/front.jade b/website/views/static/front.jade
index 304abfce7e..a3633fa407 100644
--- a/website/views/static/front.jade
+++ b/website/views/static/front.jade
@@ -75,8 +75,8 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                   a(href='/static/contact')=env.t('contactUs')
                 li
                   button#header-play-button.btn.btn-primary.navbar-btn.navbar-right(ng-click='playButtonClick()')= env.t('playButtonFull')
-      #intro
-        h1(ng-cloak) {{ variant==0 ? "#{env.t('motivate')}" : (variant==1 ? "#{env.t('motivate1')}" : "#{env.t('motivate2')}") }}
+      #intro(ng-cloak)
+        h1 {{ variant==0 ? "#{env.t('motivate')}" : (variant==1 ? "#{env.t('motivate1')}" : "#{env.t('motivate2')}") }}
         img.center-block.img-responsive(src='https://s3.amazonaws.com/habitrpg-assets/front/images/intro.png')
         // insert intro images
         .introcall.bg-success

From 4574501e07e84c9e798993a2fbb1e21911caa32f Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Sun, 21 Jun 2015 19:10:36 -0500
Subject: [PATCH 3/5] Set base stats lower for vagrantfile

---
 Vagrantfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index a1fd4f80aa..52ffdf1096 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,8 +6,8 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provider "virtualbox" do |v|
-    v.memory = 2048
-    v.cpus = 2
+    v.memory = 768
+    v.cpus = 1
     v.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"]
   end
   config.vm.box = "thepeopleseason/habitrpg"

From 7064871557fb37db16a8219d249f0a358d1ea52d Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Sun, 21 Jun 2015 19:28:19 -0500
Subject: [PATCH 4/5] Create Vagrantfile.example

---
 .gitignore                         | 1 +
 Vagrantfile => Vagrantfile.example | 0
 2 files changed, 1 insertion(+)
 rename Vagrantfile => Vagrantfile.example (100%)

diff --git a/.gitignore b/.gitignore
index 4ae45467dc..dd55d8ea09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ newrelic_agent.log
 .bower-registry
 .bower-cache
 .vagrant
+Vagrantfile
 
 *.log
 src/*/*.map
diff --git a/Vagrantfile b/Vagrantfile.example
similarity index 100%
rename from Vagrantfile
rename to Vagrantfile.example

From b4c4b891a18489d2e686d5b94ac4b6f5493f594d Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Sun, 21 Jun 2015 20:02:48 -0500
Subject: [PATCH 5/5] Moved sandbox.js to mocks directory

---
 test/spec/mocks/sandbox.js |  9 +++++++++
 test/spec/specHelper.js    | 10 ----------
 2 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 test/spec/mocks/sandbox.js

diff --git a/test/spec/mocks/sandbox.js b/test/spec/mocks/sandbox.js
new file mode 100644
index 0000000000..f095eefd09
--- /dev/null
+++ b/test/spec/mocks/sandbox.js
@@ -0,0 +1,9 @@
+var sandbox;
+
+beforeEach(function() {
+  sandbox = sinon.sandbox.create();
+});
+
+afterEach(function() {
+  sandbox.restore();
+});
diff --git a/test/spec/specHelper.js b/test/spec/specHelper.js
index 9ddacdac52..80f5858fe8 100644
--- a/test/spec/specHelper.js
+++ b/test/spec/specHelper.js
@@ -1,15 +1,5 @@
 beforeEach(module('habitrpg'));
 
-var sandbox;
-
-beforeEach(function() {
-  sandbox = sinon.sandbox.create();
-});
-
-afterEach(function() {
-  sandbox.restore();
-});
-
 specHelper = {
   newUser: function(){
     var buffs = {per:0, int:0, con:0, str:0, stealth: 0, streaks: false};