adding and fixing more crap
Merge branch 'master' of http://github.com/maxbrister/nmt-jam0