update git ignore
Merge branch 'fluent'
stop tracking fluent config
update submodules and silverstripe (3.1.4)