updated phing dependency to latest minor release, using tilde operator
added phpstorm project files to git-ignore
Merge pull request #591 from staabm/composer_tilde

Composer tilde
Revert a change in gitignore
Merge remote branch 'upstream/master'