Key refactors
Merge branch 'master' of git@github.com:seanastephens/ParanoidPosies.git
Resetting to standard.