Phpstorm 8 config, updated deploy script

Deploy script is now a little more intelligent