updates to more weird carousel bugs
Merge branch 'master' of github.com:stephenrouse/heidi