Took out subtasks for now, cleaned up some code

Made one function that adds tasks, the addNow/Next/Later functions all
just make simple calls to addTask. Removed/Commented out everything
regarding subtasks for now.