Remove garbage from a bad squash & cherry-pick

James Moger

2014-03-07 81ae0d044632ebd8f0eecbc443bc0e9e9af0b9ab

 .gitignore

@@ -24,3 +24,4 @@
/*.sh
/*.factorypath
/src/main/dagger
/src/main/java/.idea