Rearranging and more parsing tests.
Merge branch 'master' of https://github.com/joelsalisbury/angularplay