Merge pull request #122 from californiavol/master

Merge from master
added playlist module
Merge pull request #124 from californiavol/macbook-branch

Macbook branch