fixes for ubuntu 14.04
version bump
Merge pull request #4 from daftlabs/14-04-fixes

ubuntu 14.04 fixes
Merge branch 'master' into configure_xdebug

Conflicts:
	recipes/default.rb