Angular and Playlists only (resolved)

Here's a new pull for the angular branch. I've resolved all the merge conflicts with master.

I haven't changed anything in regards to the comments [here](https://github.com/martindale/soundtrack.io/pull/42#issuecomment-21974993) yet, we probably want to do that before pushing since its an easy change, but its your call.

For an example of this running correctly please see [this](http://thegridcraft.com:14000/)