Merge branch 'remove_boost' into develop.  Closes #2