Dev

Looked through the current dev branch, didn't notice anything out of the ordinary. Ryan and I discussed pushing the current dev branch up as it is stable.