a little cleanup

# Please enter the commit message for your changes. Lines starting
add test for multipoint
print run time for multipoint optimization
Merge pull request #13 from swryan/dev

add test for multipoint & some misc cleanup