Minor cleanups
More code!
Merge branch 'master' of https://github.com/Siacoin/Sia
Fixed merge conflicts.
Conflicts:
	src/disk/filesystem.go