Minor refactoring - split up image creation and uploading
Regex updates

Updated all commands to not care about extra spaces
Updated all regex to interpolate keyword1/keyword2 for trigger (nr|newrelic)
Forgot to rename some vars
added nr colors for charts
shortened the build/upload calls