Merge Evan's branch into master

Pretty self explanatory, check it out ;)