Fixed layout; turns out my jshintrc file was being ignored by gulp. This is now fixed, and the issues raised by gulp are also fixed.
Fixed tests to comply with jshint settings.