Reverted change made to pull feature
Removing .gitignore file (for now)
Added back .gitignore, added example config file
Derp. Updated README
Merge remote-tracking branch 'origin/master'