tabbar is a bit broken atm, throws bugs at start ;/
things in emacs
Merge branch 'master' of github.com:XANi/config
autolink
config update
new emacs  config
move legacy config, make space for puppetifying it
add basic config
mouse cfg
Merge branch 'master' of github.com:XANi/config

Conflicts:
	.gitignore
fixes
move repo config to hiera
hack around hiera single datadir to allow merging hiera data from multiple repos
sort keys so lines will not reorder randomly
add dpp config, fixes
add monit module
add puppet repo
random package name change in new puppet repo
Nope, 3.0 still full of bugs

Revert "random package name change in new puppet repo"

This reverts commit 845c9ea342c36408a23a74c4fe3af2a4048bb587.

Revert "add puppet repo"

This reverts commit d7b674e9f9eb7afd27265101277ef75129a90472.
add to monit