Added UTF-8 as default file encoding, added emmet settings
Added emmet plugin and ActionScript sytnax highlighting
Updated Terminator settings
Merge branch 'master' of github.com:queezythegreat/settings

Conflicts:
	vimrc