leftover from last time
js changes from Colton's suggestions (thanks Colton)
pulled master changes
began rewriting angular to use