Merge pull request #1 from todb-r7/pr1217-fix-gitignore-conflict

Pr1217 fix gitignore conflict

Author: schierlm

.gitignore

@@ -1,3 +1,4 @@
+.bundle
 # Rubymine project directory
 .idea
 # RVM control file
@@ -6,11 +7,19 @@
 .yardoc
 # Mac OS X files
 .DS_Store
+# database config for testing
+config/database.yml
 # simplecov coverage data
 coverage
 data/meterpreter/ext_server_pivot.dll
 data/meterpreter/ext_server_pivot.x64.dll
-doc
+doc/
+external/source/meterpreter/java/bin
+external/source/meterpreter/java/build
+external/source/meterpreter/java/extensions
+external/source/javapayload/bin
+external/source/javapayload/build
+# Java binary ignores. Replace the 5 above with this once we're merged.
 external/source/javapayload/*/.classpath
 external/source/javapayload/*/.project
 external/source/javapayload/*/.settings
@@ -27,3 +36,4 @@ tags
 *.swp
 *.orig
 *.rej
+*~