Merge pull request #2 from tcsorcs/master

syncing to local branch
Fixed issues

Fixed some build issues stemming from merged code. Also committing
R-related files, though I'm not sure it's necessary.
Merge pull request #6 from HypnoticSheep/master

Fixed Merge Issues