Merging dev into gh-pages so they're both synced up

I didn't wait to get the 2 thumbs up bc @LoganArnett and @Nhare had already ok'd the changes. See PR #23