updates, make sure autostart works right
Merge branch 'master' of https://github.com/yramagicman/dotfiles

* 'master' of https://github.com/yramagicman/dotfiles:
  updates, make sure autostart works right

Conflicts:
	.autostart