Did a few updates before I branch off and start moving over to Java
based config.
Merge branch 'master' of https://jpitsch@github.com/jpitsch/jp_music.git