Merge pull request #72 from edwardt/master

(minor improvement) Use variable for SparkR assembly versioning in Makefile; ignore folders and files generated in unit tests to avoid accidental checkins
Merge remote-tracking branch 'amplab/master' into addjira
don't check in gedit buffer file'