Added fabfile
Added deploy submodule
Added .DS_Store to ignore file
Updated fabfile to use python module, and added json config file for deployment
Updated fabfile, simplified
Merge remote-tracking branch 'origin/develop'

Conflicts:
	.gitignore
	.gitmodules