- Converted tabs to spaces (tsk tsk old self)
- Working on making template merger work in ubuntu (WIP)