Merge pull request #1 from johnmccutchan/master

update to latest master
Adapt to changes made in spectre/vector_math
Merge pull request #6 from pjako/master

Adapt to changes made in spectre, vector_math