add irc notification to travis-ci
tweak gitignore - is that what's fucking up travis-ci?
Merge branch 'master' of https://github.com/UpstandingHackers/hammer
Fixed clang implicit type cast warning
add -lrt to build flags for clock_gettime
Merge remote-tracking branch 'thequux/master'

Conflicts:
	SConstruct