json settings
stylus settings
javascript: no indenting
vimrc: catchup
vimrc: catchup
Merge remote-tracking branch 'albion/master'

* albion/master:
  vimrc: catchup
  javascript: no indenting
  stylus settings
  json settings
  update
  various

Conflicts:
	vimrc
update vimrc