settings additions, style cleanup
Merge branch 'master' of github.com:davidjosephhayes/spotticker
Merge branch 'master' of github.com:davidjosephhayes/spotticker