Changes from live
Merge branch 'master' of github.com:patrickmcsweeney/syllabalastic