integrate changes from slarge svn
Merge branch 'master' into 0start-reset
Merge branch '0start-reset' into 1implementuser
Merge branch '1implementuser' into 2add_debug
Move config into src folder
insignificant
join fcn endings in commands

it makes it much easier to traverse around files and to
see what the functions are (when you use folds)