"Initial" Merge

Post-derp merging, to get everything on the same level. Will be using the 'GitYami' branch as a fork, as a fork cannot be made for an owned repository.