Merge branch 'develop'
Forcing redirect from www to non-www.
Merge branch 'master' of github.com:tbeigle/cbmusic