Add more variables
Merge remote-tracking branch 'upstream/master' into patch04

Conflicts:
	src/main/java/com/dsh105/holoapi/util/TagFormatter.java
Merge pull request #30 from stuntguy3000/patch04

Add more variables
Improve detection of image lines in holograms

Fixes images in the build command having lines out of place
All hail the cap'n