Merge pull request #1 from aproctor/master

Sync
derpyderpymikesucks
yella
Merge pull request #2 from aproctor/master

Sync
Merge pull request #3 from aproctor/master

Sync
no message
Merge pull request #7 from tylerhebenton/master

mike sucks