remove hsftp - add better javascript
Merge remote-tracking branch 'origin'

* origin:
  again lot of stuff
  add better js support

Conflicts:
	.vimrc
remove emmet
Merge remote-tracking branch 'origin/master'

* origin/master:
  add perl5 lib local
  add .editorconfig
  remove emmet add scss-syntax
add some stuff
Merge remote-tracking branch 'origin/master'

* origin/master:
  some other stuff

Conflicts:
	.vimrc
Merge branch 'master' of github.com:johannestroeger/dotfiles

* 'master' of github.com:johannestroeger/dotfiles:
  add perl support
  stuff
  new stuff
Merge branch 'master' of github.com:johannestroeger/dotfiles

* 'master' of github.com:johannestroeger/dotfiles:
  remove unused plugin
  stuff
  stuff
  stuff
  stuff
  stuff
  faster ex commands
  some kind of roll back
  moar stuff
  fix colours
  editorconfig update
  clean up
  stuff
need that..
Merge branch 'master' of github.com:johannestroeger/dotfiles

* 'master' of github.com:johannestroeger/dotfiles:
  stuff
  stuff