Terms and such
Merge branch 'master' of github.com:JustinHop/Profile
Added shortcut for psc