Various
Resolved conflicts
Merge branch 'master' of github.com:alexlee-gk/trajopt
Clean up barret example.