Modify .gitignore to work on v4 peacefully
Prepare to update guice
Squashed 'guice/' content from commit 3582277

git-subtree-dir: guice
git-subtree-split: 3582277dd2180a3561c903f5baecef9817a41463
Merge commit '41e273d1f39ff34f002b839178aa769e6d0d7c8b' as 'guice'
Remove old copy of guice.
Update version numbers of additional tests and astroboy
To avoid using a hack context provider... ;)

Solves a bug in context provider as current context may not be the desired context owning the scope of the desired injected instance.
(Let's see if this passes tests)
Update ContextScopedProvider.java

Re trigger travis and link with https://github.com/roboguice/roboguice/issues/112