Java 7 nio + OSX jna file watching
Merge branch 'v2-r1' of gh:tailrecursion/boot into v2-r1

Conflicts:
	boot/core/src/boot/task/built_in.clj