Merge remote branches 'mjgoins/master' and 'jrollins/master'
-rw-r--r-- 3 .gitignore
-rw-r--r-- 885 README
-rw-r--r-- 270 TODO
-rwxr-xr-x 1880 msva