refactor
Merge remote-tracking branch 'origin/master'

Conflicts:
	inputs/makesnippets.pl.in
	lsl2dfg/lsloutputs/sublime_completions.py