Added test for adding songs to playlists.  Fixed a couple nil reference exceptions received when creating the test.
Merge branch 'master' of github.com:bearded-nemesis/bearded-nemesis