added inteelij idea ultimate 13
updated virtualbox to version 4.3.6
updated vagrant to 1.4.2
updated libreoffice
Merge branch 'master' of https://github.com/jayshao/ansible-osx into jayshao-master

Conflicts:
	virtualbox.yml
updated vagrant to 1.5.0
updated intellij to 13.1
add macvim
fixed macvim playbook
bumped virtualbox to 4.3.10
updated alfred 2 url
updated java7 version and url
fixed java 7 options