Cleaned up brackets and echo statements
resolve conflicts
Merge branch 'ragingpastry-master'