minor stuff
Merge branch 'master' of github.com:joschu/trajopt
moved stuff around