Added autocomplete fix
Merge branch 'folsom' of https://github.com/odyssey4me/horizon into folsom