more fixes, incanter.core/matrix should always return 2D matrix
misc edits, use latest core.matrix