Avoid splatting

Also tightened up a couple loops that involved splatting
Array{T,1} => Vector{T}
Avoid initializing values that are about to be overwritten