Merging in multiple pull requests#294

justin-ven merged 5 commits intosimpaths:developsimpaths/SimPaths:developfrom

justin-ven:developjustin-ven/SimPaths:developCopy head branch name to clipboard