Merge alesliehughes

Merged all my changes from my tree.

I've keep the aliases/commands static for now, and will at some points use the config.ps1 as Jay has suggested.