Added header files to tags construction.
Merge branch 'master' into pointToVect
Finished converting points to vectors, whee appropriate.