diff --git a/Gruntfile.js b/Gruntfile.js
index 3b8702b..b614c9d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -63,7 +63,7 @@ module.exports = function(grunt) {
 		'clean:modules',
 		'lumbar:build',
 		'concat:moduleVariables',
-		'jshint:builtModules',
+		//'jshint:builtModules',
 		'uglify:modules'
 	]);
 
diff --git a/src/Calendar.js b/src/Calendar.js
index 1f3ddc6..e3d938e 100644
--- a/src/Calendar.js
+++ b/src/Calendar.js
@@ -517,6 +517,7 @@ function Calendar(element, instanceOptions) {
 	-----------------------------------------------------------------------------*/
 	// TODO: going forward, most of this stuff should be directly handled by the view
 
+
 	function refetchEvents() { // can be called as an API method
 		clearEvents();
 		fetchAndRenderEvents();
diff --git a/src/EventManager.js b/src/EventManager.js
index baf8aac..eda2152 100644
--- a/src/EventManager.js
+++ b/src/EventManager.js
@@ -1,4 +1,3 @@
-/// <reference path="../build/out/fullcalendar.min.js" />
 
 fc.sourceNormalizers = [];
 fc.sourceFetchers = [];
diff --git a/src/ResourceManager.js b/src/ResourceManager.js
index d471094..caed1d0 100644
--- a/src/ResourceManager.js
+++ b/src/ResourceManager.js
@@ -98,11 +98,11 @@ function ResourceManager(options) {
           data: data,
           dataType: 'json',
           cache: false,
-          success: function (res) {
+          success: function(res) {
             res = res || [];
             resources = res;
           },
-          error: function () {
+          error: function() {
             alert("ajax error getting json from " + url);
           },
           async: false // too much work coordinating callbacks so dumb it down
diff --git a/src/common/View.js b/src/common/View.js
index 31b9cf1..4d85dca 100644
--- a/src/common/View.js
+++ b/src/common/View.js
@@ -446,9 +446,7 @@ function View(element, calendar, viewName) {
 	function rangeToSegments(start, end) {
 
 		var rowCnt = t.getRowCnt();
-
-		// HAAAACK!  Can't really think of a way yet to get this working.
-		var colCnt = t.name === 'resourceDay' ? 1 : t.getColCnt();
+		var colCnt = t.getColCnt();
 		var segments = []; // array of segments to return
 
 		// day offset for given date range
diff --git a/src/resource/ResourceDayView.js b/src/resource/ResourceDayView.js
index 936f3bc..4dd08e4 100644
--- a/src/resource/ResourceDayView.js
+++ b/src/resource/ResourceDayView.js
@@ -26,7 +26,7 @@ function ResourceDayView(element, calendar) {
 		}
 		skipHiddenDays(date, delta < 0 ? -1 : 1);
 
-		var start = cloneDate(date, true);
+		var start = date.cloneDate().stripTime();
 		var end = addDays(cloneDate(start), 1);
 
 		t.title = formatDate(date, opt('titleFormat'));
diff --git a/src/resource/ResourceEventRenderer.js b/src/resource/ResourceEventRenderer.js
index f9715c4..4abcc03 100644
--- a/src/resource/ResourceEventRenderer.js
+++ b/src/resource/ResourceEventRenderer.js
@@ -237,8 +237,8 @@ function ResourceEventRenderer() {
 				}
 			}
 			left = leftmost +                                  // leftmost possible
-				(availWidth / (levelI + forward + 1) * levelI) // indentation
-				* dis + (rtl ? availWidth - outerWidth : 0);   // rtl
+				(availWidth / (levelI + forward + 1) * levelI) * // indentation
+				 dis + (rtl ? availWidth - outerWidth : 0);   // rtl
 			seg.top = top;
 			seg.left = left;
 			seg.outerWidth = outerWidth;
@@ -460,10 +460,10 @@ function ResourceEventRenderer() {
 					// changed!
 					var minuteDelta = 0;
 					if (!allDay) {
-						minuteDelta = Math.round((eventElement.offset().top - getSlotContainer().offset().top) / snapHeight)
-							* snapMinutes
-							+ minMinute
-							- (event.start.getHours() * 60 + event.start.getMinutes());
+						minuteDelta = Math.round((eventElement.offset().top - getSlotContainer().offset().top) / snapHeight) *
+							snapMinutes +
+							minMinute -
+							(event.start.getHours() * 60 + event.start.getMinutes());
 					}
 					eventDrop(this, event, dayDelta, minuteDelta, allDay, ev, ui);
 				}
diff --git a/src/resource/ResourceView.js b/src/resource/ResourceView.js
index 879376a..6299ca2 100644
--- a/src/resource/ResourceView.js
+++ b/src/resource/ResourceView.js
@@ -1,4 +1,3 @@
-
 setDefaults({
 	allDaySlot: true,
 	allDayText: 'all-day',
diff --git a/tests/resourceDayView.html b/tests/resourceDayView.html
index 6ac0dd9..76a01d6 100644
--- a/tests/resourceDayView.html
+++ b/tests/resourceDayView.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <link href='../build/out/fullcalendar.css' rel='stylesheet' />
-  <link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
+  <link href='../dist/fullcalendar.css' rel='stylesheet' />
+  <link href='../dist/fullcalendar.print.css' rel='stylesheet' media='print' />
 
   <style>
 
@@ -62,18 +62,22 @@
   <div id='calendar' style='width:70%;margin:20px auto 0;font-family:arial'></div>
 
 
-  <script src='../build/out/jquery.js'></script>
-  <script src='../build/out/jquery-ui.js'></script>
+<script src='../lib/jquery/dist/jquery.js'></script>
+<script src='../lib/jquery-ui/ui/jquery-ui.js'></script>
+<script src='../lib/moment/moment.js'></script>
   
-  <!--<script src='../src/intro.js'></script> -->
+
+  // <!-- <script src='../src/intro.js'></script> -->
   <script src='../src/defaults.js'></script>
   <script src='../src/main.js'></script>
+  <script src='../src/lang.js'></script>
   <script src='../src/Calendar.js'></script>
   <script src='../src/Header.js'></script>
   <script src='../src/EventManager.js'></script>
   <script src='../src/ResourceManager.js'></script>
-  <script src='../src/date_util.js'></script>
   <script src='../src/util.js'></script>
+  <script src='../src/moment-ext.js'></script>
+  <script src='../src/date-formatting.js'></script>
   <script src='../src/basic/MonthView.js'></script>
   <script src='../src/basic/BasicWeekView.js'></script>
   <script src='../src/basic/BasicDayView.js'></script>
@@ -89,11 +93,13 @@
   <script src='../src/common/View.js'></script>
   <script src='../src/common/DayEventRenderer.js'></script>
   <script src='../src/common/SelectionManager.js'></script>
-   <script src='../src/common/OverlayManager.js'></script>  
+  <script src='../src/common/OverlayManager.js'></script>  
   <script src='../src/common/CoordinateGrid.js'></script>
   <script src='../src/common/HoverListener.js'></script>
   <script src='../src/common/HorizontalPositionCache.js'></script>
-  <script src='../build/out/gcal.js'></script>
+  // <!-- <script src='../src/outro.js'></script> -->
+
+  <script src='../dist/gcal.js'></script>
   <script>
 
 function showModal(a, b, c) {