Merged an out of control branch into something manageable and somewhere around version 0.4. Essentially incorporated beginning steps of future features, and fixed the undesired branch in development versions.
Fixed merging issue with origin/master and local