updating PPA for php 5.6
attempting to fix issue of importing PPAs due to locale settings
Merge branch 'master' of github.com:fideloper/Vaprobash into php5.6
moved TZ to base and setting locale in .bashrc so its always exported
Merge branch 'master' into php5.6
fixing xdebug issue with 5.6 - cannot install php5.6
with xdebug, possibly due to phpdbg "taking over"
using C.UTF8 over en_US.UTF8
i dont know wtf is up with utf8 and encoding issues
woops, had to remove x-debug
locale set in PHP script as well as in .bashrc
Update base.sh
Merge pull request #379 from necrogami/master

Update base.sh for software-properties-common
re-added xdebug
Merge branch 'php5.6'
Merge branch 'master' of github.com:fideloper/Vaprobash
Merge branch 'master' into theand1404

Conflicts:
	Vagrantfile
	scripts/base.sh