Renamed jasmine stuff to "spec"; other formatting