Merge flim-1_14-wl to master

This merges the flim-1_14-wl branch into master, after merging one change (a typo fix) from master into flim-1_14-wl.

I am doing this because MELPA would prefer not having to specify a branch to checkout, and since the git repo is now the primary repo it makes sense (I believe) to develop on master.