Added *~ filter in .gitignore
Corrected submodule path for the 'funnel' repository
Resolved the 'funnel' submodule reference-tree, now at 'funnel/master' branch, commit: 13d97e3e841ae872cc22e87b7603e0b3efecc02b