Updated .gitignore
Merge remote-tracking branch 'upstream/master'
added a line
Merge pull request #1 from blehman/master

I am incorp you updates.
Merged JMontague's awesomer changes
Removed old pdf draft