Commit all files... hopefully.
Merge branch 'jmwhicke'

Updating master with jmwhicke files... hopefully works SHIT!