Fixing Neoplixel Version

The Neopixel version was not working. I updated to the latest FastLED
library that uses the RMT feature and a second core. I also updated the
code to make it easier to deal with the differences between the Neopixel
and Dotstar versions.

README.md

@@ -35,7 +35,6 @@ This was ported from the [TWANG fork](https://github.com/bdring/TWANG) by bdring
 
 ## TO DO List:
 
-<<<<<<< HEAD
 - Wireless features~~
   - 2 Player features by linking controllers. TBD
 =======
@@ -52,7 +51,6 @@ This was ported from the [TWANG fork](https://github.com/bdring/TWANG) by bdring
   - More robust.
   - Integrated audio amplifier.
 - Python (it might be fun to make a Python version)
->>>>>>> origin/master
 
 - Digitized Audio
   - Currently the port uses the same square wave tones of the the Arduino version.