Merge pull request #1 from Caglow/master

Derp
Merge pull request #2 from Caglow/master

Merge upstream.
Update pygalil dep.
Merge pull request #2 from fake-name/master

Update PyGalil with indexing stuff.