adding more info to js config object to help with typeahead customisation
Merge branch 'master' of github.com:socd-io/Theme
not fixing the hover/touch menu thing
Merge branch 'master' of github.com:socd-io/Theme

Conflicts:
	assets/sass/_main-navigation.scss