Improved 'if' and 'ife' snippets for js.
Merge remote-tracking branch 'harry/improve-if-e-for-js'

Conflicts:
	UltiSnips/javascript.snippets