Merging in from 10up VVV Master
Adding in Xdebug for using profiling
Merging upstream
Merge remote-tracking branch 'cklosowski-master/master'