Took stuff out

Yeah
Merge branch 'dustin' into dev
Merge branch 'dev' into dbarth