Fix minor merge conflicts in README and package.xml

- Just some whitespace and updating the version number.

Conflicts:
	README.md
	package.xml
	src/tega_teleop_ros.py

README.md

@@ -9,6 +9,7 @@ robot, as well as commands to send to an opal tablet.
 `python tega_teleop.py [-h] [-e]`
 
 optional arguments:
+
     - `-h`, `--help`: show this help message and exit
     - `-e`, `--use-entrainer`: Send audio to the audio entrainer on the way to
       the robot.
@@ -17,11 +18,11 @@ On startup, this python node will try to connect to roscore. If roscore is not
 running, the program will exit.
 
 If this node is running on a network where DNS does not resolve local
-hostnames, you will need to export the environment variable $ROS\_IP and
-$ROS\_HOSTNAME to be the public IP address of this node. For example, if the
+hostnames, you will need to export the environment variables `$ROS_IP` and
+`$ROS_HOSTNAME` to be the public IP address of this node. For example, if the
 machine this node is running on has the IP address "192.168.1.20", you would
-run the commands `export ROS\_IP=192.168.1.20` and `export
-ROS\_HOSTNAME=192.168.1.20` in your shell prior to starting this node. If this
+run the commands `export ROS_IP=192.168.1.20` and `export
+ROS_HOSTNAME=192.168.1.20` in your shell prior to starting this node. If this
 IP is static, you may want to put these commands in your bashrc file (or other
 shell rc file)  so you don't have to remember to run them every time.
 

package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>tega_teleop</name>
-  <version>1.2.0</version>
+  <version>2.1.0</version>
   <description>An interface to remotely teleoperate the Tega robot</description>
 
   <maintainer email="[email protected]">jakory</maintainer>