Merge branch 'dev' into dev-cachedir

Conflicts:
	.gitignore
	README.markdown
	gitit.sh
Merge branch 'dev' into dev-dot

Conflicts:
	.gitignore
	README.markdown
	gitit.sh
Merge branch 'dev-dot' into dev-dot+cachedir

Conflicts:
	README.markdown
Merge branch 'dev-cachedir' into dev-dot+cachedir

Conflicts:
	gitit.sh
prefix temp files with dot instead of diagram
prefix temp files with dot instead of diagram
Merge branch 'dev-dot+cachedir'

Conflicts:
	README.markdown