Merge pull request #15 from thebruce/dev

Dev
Ouch. First run-through was kinda rough... but we fixed some shit!
Merge pull request #13 from tsmith512/dev

Dev