Merged techoholic gsoc branch and updated code to remove deprecated features/plugins