Merge pull request #1 from verwoerd/master

NWERC 2013 updates
System update
Added /opt programs
Merge remote-tracking branch 'nwerc-presentation/master'
Last changes for presentation tomorrow. Including speaker of TomTom