Merge pull request #8 from tnason/master

more updates.. i should set up git better
Merge pull request #9 from tnason/master

updates on updates on updates
fixes
fixes
fixes
Merge pull request #65 from jamesclampffer/master

stuff