Merge flymake-stan back into stan-mode