Caplet stripping stills needs tinying up. NLLS with penalty methods are slow (possible bug in NLLSWP)
Merge remote branch 'refs/remotes/origin/develop' into develop

Conflicts:
	projects/OG-Analytics/src/test/java/com/opengamma/analytics/financial/interestrate/capletstripping/CapletStrippingAbsoluteStrikeTest.java
fixed imports