Changed some stuff trying to resolve the missing dependancy error
Changed some stuff to potentially make commands run better and advoid
bugs
I did some Noob things in here XP and reverted them
Just the usual changes after a Maven clean and install
Merge remote-tracking branch 'origin/master'