Added more features and forced dependancies
Merge branch 'master' of https://github.com/JRL1004/Ninjanaut.git