Use nabor (not RANN) to find nearest neighbours
Merge branch 'feature/nabor-pkg'

* feature/nabor-pkg:
  Use nabor (not RANN) to find nearest neighbours
* nabor offers some speed improvements – I have noticed an ~ 1.33x speed-up tested
  over large random samples of neurons.
* It will also provide the opportunity for using a KDNeuron structure for speeding
  up neuron searches without a memory penalty. This gave ~ 2x speed-up.
* nabor is now on CRAN and built for all platforms
Merge branch 'master' of github.com:jefferislab/nat.nblast

# By James Manton (9) and Gregory Jefferis (8)
# Via James Manton
* 'master' of github.com:jefferislab/nat.nblast:
  Fix partial argument matches in seq.int() calls for R CMD check's benefit
  Add utility function to convert a vector of scores into named row or column matrix
  Add example for sparse matrix creation
  Add function to fill in blocks of sparse matrix
  fix and test names in diagonal(sparse matrix)
  Teach diagonal to use fast_disk_diag for on disk matrices
  new function to find diagonals from on disk matrix
  Tidy sparse_score_mat and use diagonal()
  STY: tidying of diagonal
  fix reading complete diagonal of bigmatrix
  Slightly optimise the creation of sparse score matrices
  Fix test of sparse matrices to deal with fact that diagonal is now inc.
  Fix conversion of ff/bigmatrix to matrix in sparse matrix generation
  Make sure sub_score_mat does not try and do diag() on a sparse matrix
  Add diagonal when creating sparse matrices
  Teach diagonal() to deal with sparse matrices
  Add function to convert a subset of a score matrix to sparse representation

Conflicts:
	NAMESPACE