Added TODO like I knew what I was doin
Took care of most of TODO items (the low-hanging fruit)
Removed the link element
Merge branch 'master' of https://github.com/eriklebsen/trainstation