Fixed formatting issue
Test \_x\_
Another formatting test
Formatting changes
Formating change
Removed node re: underscores
Added info for OS X
Merge branches 'dev' and 'master'