Merge branch 'distcc' of github.com:CraZySacX/overbuild into distcc
Merge branch 'master' into distcc
Merge branch 'master' into distcc
Merge branch 'master' into distcc
Merge branch 'master' into distcc
Merge branch 'master' into distcc
Merge branch 'master' into distcc
Merge branch 'master' into distcc
Merge branch 'master' into distcc
Merge branch 'master' into distcc
Merge branch 'master' into distcc
alignment
version update
version bumps
timbre updates
gcc 4.8 stuff
Merge branch 'distcc'
Merge branch 'master' into 1.0

Conflicts:
	project.clj