carousel fix
more carousel stuff, think this is the last of it
Merge branch 'master' of github.com:stephenrouse/heidi