Squashed 'core/' changes from 4eba548..d78c786

d78c786 Merge pull request #9 from dylanreid/feature5
983cf17 -n 5

git-subtree-dir: core
git-subtree-split: d78c7868c6d1bfb5a683c1ecdaef6cce631f6f2b
Merge commit 'e47dba9719effa72727250333654a04efce1e7cf'
Squashed 'core/' changes from d78c786..a937670

a937670 Merge pull request #10 from dylanreid/feature6
a771069 -n 6

git-subtree-dir: core
git-subtree-split: a937670fb557ec8a4e22700b3944c07582274cff
Merge commit '4d3b748d969bf75e5af30852b5ad5885e31c35c1'