did some minor changes to post layout, aded excerpt separator, rebuilt package.json and the gruntfile to optimize tasks and run jekyll from grunt
fixing merging errors