it looks like travis needs us to explicitly require util now
(RequireUtil) Add require for some util, remove where unneeded
(RequireUtil) Fix shib init require ordering
(RequireUtil) Fix require ording; pull oae-rest from master
Fix 'path' variable names in image processing
(RequireUtil) Switch oae-rest back to latest npm
(RequireUtil) Fix up some commands
Fixed up doc type
Merge branch 'requireUtil' of https://github.com/mrvisser/Hilary into requireUtil

Conflicts:
	node_modules/oae-util/lib/image.js
Merged master into simong/emailaggregation