Merge pull request #4 from aproctor/master

Sync
Merge pull request #5 from aproctor/master

Sync
Merge pull request #6 from aproctor/master

What?
LDStuff and more.
Merge pull request #7 from aproctor/master

sync
Merge pull request #12 from tylerhebenton/master

Sync?