Adding build/ and dist to file ignored by git.
Declaring variables at top and now using same names.
Adhering to aerogear-js code standards.
add inital update conflict test
remove unneeded semicolons,  add some semicolons