Merge pull request #4 from ErlendSB/master

Fixed: broken last.fm api key
Last.fm playlist generator updated
Merge remote-tracking branch 'upstream/master'