c
Merge branch 'master' of http://github.com/floppycode/home-config

Conflicts:
	.gitignore
	.pentadactyl/info/default/command-history
	.pentadactyl/info/default/local-marks
	.pentadactyl/info/default/register-ring