Merge branch 'master' into Jon
Ready to merge
Merge branch 'Jon'
Merge branch 'master' into jon
This branch includes alot of updates that should have been merged awhile back.
Fixed typos
Merge branch 'master' of https://github.com/neiucss/neoteric

eed to be on the same page