Merge pull request #1 from wagnert/master

Add .buildpath to .gitignore
Update composer.json
Update composer.json