filled out parse_atomic() and parse_select()
Merge branch 'master' of https://github.com/johnprock/315