fix docblock and clean up gitignore again because of http://www.craftitonline.com/2013/10/ignore-symfony2-phpstorm-files-like-a-pro-with-global-ignoring/