Updated from point-guard

Pulled latest files from Josh's master branch