Initial commit to add setup script for Ubuntu
Add OS X setup instruction and tomcat installation for ubuntu
Update osx setup instruction
Remove LL specific steps
Upgrade instruction for vagrant and virtual box
Update cocoapod install instruction
Merge branch 'master' of https://github.com/zhoulijoe/development_setup

Conflicts:
	osx_setup.md