Clean up base file and moved a lot to custom file
Merge branch 'master' of https://github.com/ctaylo21/jarvis