Merge repos

@the-apathetic-w 

These are the changes to merge from the old repo.