Use new ruby hash syntax everywhere
Remove awkward pushfile concept