Magic word style parser (and minor tweaks)

Added logic to magic word comment parsing, where different keywords will
now display with different colors when uploaded. Also some minor tweaks
to function names to avoid name collisions.
Merge remote-tracking branch 'origin/devel'