Added PhpStorm7.0 settings and some little upgrades to gitconfig