Merge pull request #1 from vforgione/dev

merge dev into master
Merge pull request #2 from vforgione/dev

merge dev into master
Merge pull request #3 from vforgione/dev

finished out initial reqs
added diff stuff