futzing with makefile.

static vignette still hosed.
Merge branch 'master' of https://github.com/shabbychef/SharpeR

pull from master.
adding back failed rm.
fixing dynamic and static vignettes.

'fixing' means don't look here. bleah.