added some php snippets and vimrc lines 6-25-2014
resolved conflicts