Merging
Merge branch 'master' of https://github.com/pxinghao/occ-submodularmax

Conflicts:
	nips2014/parallel_submodular.log
	nips2014/parallel_submodular.pdf
Mergining
Update
Macro
Cleaned up appendix
Update to results section
Move most of separable sums to appendix
Cleaning up separable sums appendix
Switch to using eps / pdf images instead of png
Adding new eps / pdf images
Changing from eps to pdf
adding transactional model