Started patching unit tests
Resolved merge conflict
Finished fixing bugs.

Audio urls fixed up. Added explicit ordering since Angular's ng-repeat decided to start ordering things all of a sudden.
Also fixed up audio urls and spectrogram urls on annotation library page.
Fixed bu on annotationItem page that was causing binding errors... gave an empty configuration.